- align neutrino-plugins.mk to max_10

make/neutrino-plugins.mk

@@ -108,9 +108,9 @@ neutrino-plugin-%: $(NP_OBJ_DIR)/config.status
 
 $(D)/channellogos: $(SOURCE_DIR)/$(NI-LOGO-STUFF) $(SHAREICONS)
 	rm -rf $(SHAREICONS)/logo
-	mkdir -p $(SHAREICONS)/logo
+	install -d $(SHAREICONS)/logo
 	install -m 0644 $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logos/* $(SHAREICONS)/logo
-	mkdir -p $(SHAREICONS)/logo/events
+	install -d $(SHAREICONS)/logo/events
 	install -m 0644 $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logos-events/* $(SHAREICONS)/logo/events
 	$(CD) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logo-links; \
 		./logo-linker.sh logo-links.db $(SHAREICONS)/logo
@@ -133,37 +133,45 @@ $(D)/doscam-webif-skin:
 
 # -----------------------------------------------------------------------------
 
+NEUTRINO-MEDIATHEK_VER    = git
+NEUTRINO-MEDIATHEK_TMP    = mediathek.$(NEUTRINO-MEDIATHEK_VER)
+NEUTRINO-MEDIATHEK_SOURCE = mediathek.$(NEUTRINO-MEDIATHEK_VER)
+NEUTRINO-MEDIATHEK_URL    = https://github.com/neutrino-mediathek
+
 $(D)/neutrino-mediathek: $(SHAREPLUGINS) | $(TARGET_DIR)
-	$(REMOVE)/mediathek.git
+	$(REMOVE)/$(NEUTRINO-MEDIATHEK_TMP)
-	get-git-source.sh https://github.com/neutrino-mediathek/mediathek.git $(ARCHIVE)/mediathek.git
+	get-git-source.sh $(NEUTRINO-MEDIATHEK_URL)/$(NEUTRINO-MEDIATHEK_SOURCE) $(ARCHIVE)/$(NEUTRINO-MEDIATHEK_SOURCE)
-	$(CPDIR)/mediathek.git
+	$(CPDIR)/$(NEUTRINO-MEDIATHEK_SOURCE)
-	$(CHDIR)/mediathek.git; \
+	$(CHDIR)/$(NEUTRINO-MEDIATHEK_TMP); \
 		cp -a plugins/* $(SHAREPLUGINS)/; \
 		cp -a share $(TARGET_DIR)
-	$(REMOVE)/mediathek.git
+	$(REMOVE)/$(NEUTRINO-MEDIATHEK_TMP)
 	$(TOUCH)
 
 # -----------------------------------------------------------------------------
 
-LINKS_VER = 2.19
+LINKS_VER    = 2.19
+LINKS_TMP    = links-$(LINKS_VER)
+LINKS_SOURCE = links-$(LINKS_VER).tar.bz2
+LINKS_URL    = http://links.twibright.com/download
 
-$(ARCHIVE)/links-$(LINKS_VER).tar.bz2:
+$(ARCHIVE)/$(LINKS_SOURCE):
-	$(DOWNLOAD) http://links.twibright.com/download/links-$(LINKS_VER).tar.bz2
+	$(DOWNLOAD) $(LINKS_URL)/$(LINKS_SOURCE)
 
 LINKS_PATCH  = links.patch
 LINKS_PATCH += links-ac-prog-cxx.patch
 LINKS_PATCH += links-input-$(BOXTYPE).patch
 LINKS_PATCH += links-accept_https_play.patch
 
-$(D)/links: $(D)/libpng $(D)/libjpeg $(D)/openssl $(ARCHIVE)/links-$(LINKS_VER).tar.bz2 $(SHAREPLUGINS) | $(TARGET_DIR)
+$(D)/links: $(D)/libpng $(D)/libjpeg $(D)/openssl $(ARCHIVE)/$(LINKS_SOURCE) $(SHAREPLUGINS) | $(TARGET_DIR)
-	$(REMOVE)/links-$(LINKS_VER)
+	$(REMOVE)/$(LINKS_TMP)
-	$(UNTAR)/links-$(LINKS_VER).tar.bz2
+	$(UNTAR)/$(LINKS_SOURCE)
-	$(CHDIR)/links-$(LINKS_VER)/intl; \
+	$(CHDIR)/$(LINKS_TMP)/intl; \
 		sed -i -e 's|^T_SAVE_HTML_OPTIONS,.*|T_SAVE_HTML_OPTIONS, "HTML-Optionen speichern",|' german.lng; \
 		echo "english" > index.txt; \
 		echo "german" >> index.txt; \
 		./gen-intl
-	$(CHDIR)/links-$(LINKS_VER); \
+	$(CHDIR)/$(LINKS_TMP); \
 		$(call apply_patches, $(LINKS_PATCH)); \
 		autoreconf -vfi; \
 		$(CONFIGURE) \
@@ -183,9 +191,9 @@ $(D)/links: $(D)/libpng $(D)/libjpeg $(D)/openssl $(ARCHIVE)/links-$(LINKS_VER).
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	mv -f $(BIN)/links $(SHAREPLUGINS)/links.so
+	mv -f $(TARGET_BIN_DIR)/links $(SHAREPLUGINS)/links.so
 	cp -a $(IMAGEFILES)/links/* $(TARGET_DIR)/
-	$(REMOVE)/links-$(LINKS_VER)
+	$(REMOVE)/$(LINKS_TMP)
 	$(TOUCH)
 
 # -----------------------------------------------------------------------------

make/target-tools-unused.mk

@@ -123,7 +123,7 @@ $(D)/util-linux: $(D)/ncurses $(D)/zlib $(ARCHIVE)/$(UTIL_LINUX_SOURCE) | $(TARG
 ASTRA-SM_VER    = git
 ASTRA-SM_TMP    = astra-sm.$(ASTRA-SM_VER)
 ASTRA-SM_SOURCE = astra-sm.$(ASTRA-SM_VER)
-ASTRA-SM_URL    = https://gitlab.com/crazycat69/astra-sm.git
+ASTRA-SM_URL    = https://gitlab.com/crazycat69
 
 # workaround unrecognized command line options
 $(D)/astra-sm: TARGET_ABI=""

make/target-tools.mk

@@ -1182,7 +1182,7 @@ $(D)/wpa_supplicant: $(D)/openssl $(ARCHIVE)/$(WPA_SUPPLICANT_SOURCE) | $(TARGET
 XUPNPD_VER    = git
 XUPNPD_TMP    = xupnpd.$(XUPNPD_VER)
 XUPNPD_SOURCE = xupnpd.$(XUPNPD_VER)
-XUPNPD_URL    = https://github.com/clark15b/xupnpd.git
+XUPNPD_URL    = https://github.com/clark15b
 
 XUPNPD_PATCH  = xupnpd-dynamic-lua.patch
 XUPNPD_PATCH += xupnpd-fix-memleak.patch