From: Markham Date: Sun, 8 Aug 2021 15:22:20 +0000 (+0200) Subject: BS: fix some variables X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=006152e868302bd502ade94b225bc5cac6761cad;p=bs-cst-neutrino-hd.git BS: fix some variables --- diff --git a/make/libraries.mk b/make/libraries.mk index 401ca4f..71646ed 100755 --- a/make/libraries.mk +++ b/make/libraries.mk @@ -12,7 +12,7 @@ ncurses-prereq: false; \ fi -$(D)/libass: $(D)/freetype $(D)/libfribidi $(ARCHIVE)/libass-$(LIBASS_VER).tar.xz | $(TARGET_DIR) +$(D)/libass: $(D)/freetype $(D)/libfribidi $(ARCHIVE)/libass-$(LIBASS_VER).tar.xz | $(TARGETPREFIX) $(START_BUILD) $(UNTAR)/libass-$(LIBASS_VER).tar.xz pushd $(BUILD_TMP)/libass-$(LIBASS_VER) && \ @@ -269,7 +269,7 @@ $(D)/rpcbind: $(D)/libtirpc $(ARCHIVE)/rpcbind-$(RPCBIND_VER).tar.bz2 | $(TARGET ifeq ($(BOXSERIES), hd1) sed -i -e '/^\(udp\|tcp\)6/ d' $(TARGETPREFIX)/etc/netconfig endif - rm -rf $(TARGET_DIR)/bin/rpcgen + rm -rf $(TARGETPREFIX)/bin/rpcgen $(REMOVE)/rpcbind-$(RPCBIND_VER) $(TOUCH) diff --git a/make/plugins.mk b/make/plugins.mk index 205609a..f378d5a 100644 --- a/make/plugins.mk +++ b/make/plugins.mk @@ -163,7 +163,7 @@ $(D)/links: $(D)/libpng $(D)/libjpeg $(D)/openssl $(ARCHIVE)/links-$(LINKS_VER). $(MAKE); \ $(MAKE) install DESTDIR=$(TARGETPREFIX) mkdir -p $(TARGETPREFIX)/var/tuxbox/config/links - mv $(TARGET_DIR)/bin/links $(TARGETPREFIX)/var/tuxbox/plugins/links.so + mv $(TARGETPREFIX)/bin/links $(TARGETPREFIX)/var/tuxbox/plugins/links.so echo "name=Links Web Browser" > $(TARGETPREFIX)/var/tuxbox/plugins/links.cfg echo "desc=Web Browser" >> $(TARGETPREFIX)/var/tuxbox/plugins/links.cfg echo "type=2" >> $(TARGETPREFIX)/var/tuxbox/plugins/links.cfg