fix helper variable REMOVE

diff --git a/make/applications.mk b/make/applications.mk
index ca8234b5c17a4fd034eb8960ad4626a53c2a76a8..b419704ac51f8519107e21e9d4b52a1d9b396da7 100755 (executable)
--- a/make/applications.mk
+++ b/make/applications.mk
@@ -101,7 +101,7 @@ $(D)/e2fsprogs: $(ARCHIVE)/e2fsprogs-$(E2FSPROGS_VER).tar.gz | $(TARGETPREFIX)
                $(MAKE) -C lib/uuid  install DESTDIR=$(TARGETPREFIX); \
                $(MAKE) -C lib/blkid install DESTDIR=$(TARGETPREFIX); \
                :
-       $(REMOVE)/e2fsprogs-$(E2FSPROGS_VER) $(TARGETPREFIX)/.remove
+       $(REMOVE)/e2fsprogs-$(E2FSPROGS_VER)
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/uuid.pc
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/blkid.pc
        $(REMOVE)/e2fsprogs-$(E2FSPROGS_VER)
@@ -169,11 +169,10 @@ $(D)/rsync: $(ARCHIVE)/rsync-3.1.1pre1.tar.gz | $(TARGETPREFIX)
        $(START_BUILD)
        $(UNTAR)/rsync-3.1.1pre1.tar.gz
        pushd $(BUILD_TMP)/rsync-3.1.1pre1 && \
-               $(CONFIGURE) --prefix= --build=$(BUILD) --host=$(TARGET) --mandir=$(BUILD_TMP)/.remove && \
+               $(CONFIGURE) --prefix= --build=$(BUILD) --host=$(TARGET) --mandir=/.remove && \
                $(MAKE) all && \
                $(MAKE) install prefix=$(TARGETPREFIX)
        $(REMOVE)/rsync-3.1.1pre1
-       $(REMOVE)/.remove
        $(TOUCH)
 
 $(D)/strace: $(ARCHIVE)/strace-4.6.tar.xz | $(TARGETPREFIX)
@@ -184,11 +183,10 @@ $(D)/strace: $(ARCHIVE)/strace-4.6.tar.xz | $(TARGETPREFIX)
                CPPFLAGS="-I$(TARGETPREFIX)/include" \
                CXXFLAGS="$(TARGET_CXXFLAGS)" \
                LDFLAGS="$(TARGET_LDFLAGS)" \
-               ./configure --prefix= --build=$(BUILD) --host=$(TARGET) --mandir=$(BUILD_TMP)/.remove && \
+               ./configure --prefix= --build=$(BUILD) --host=$(TARGET) --mandir=/.remove && \
                $(MAKE) all && \
                $(MAKE) install prefix=$(TARGETPREFIX)
        $(REMOVE)/strace-4.6
-       $(REMOVE)/.remove
        $(TOUCH)
 
 $(D)/xfsprogs: $(ARCHIVE)/xfsprogs-3.1.11.tar.gz $(D)/libuuid | $(TARGETPREFIX)
@@ -206,7 +204,6 @@ $(D)/xfsprogs: $(ARCHIVE)/xfsprogs-3.1.11.tar.gz $(D)/libuuid | $(TARGETPREFIX)
                        --prefix= && \
                LCFLAGS=-I$(TARGETPREFIX)/include $(MAKE) V=1 && \
                DIST_ROOT=$(TARGETPREFIX) $(MAKE) install
-       rm -rf $(TARGETPREFIX)/.remove
        $(REMOVE)/xfsprogs-3.1.11
        $(TOUCH)
 
@@ -232,7 +229,7 @@ $(D)/ntfs-3g: $(ARCHIVE)/ntfs-3g_ntfsprogs-$(NTFS_3G_VER).tgz | $(TARGETPREFIX)
        $(TARGET)-strip $(TARGETPREFIX)/bin/ntfs-3g
        rm -f $(TARGETPREFIX)/bin/lowntfs-3g
        rm -f $(TARGETPREFIX)/bin/ntfs-3g.*
-       $(REMOVE)/ntfs-3g_ntfsprogs-$(NTFS_3G_VER) $(TARGETPREFIX)/.remove
+       $(REMOVE)/ntfs-3g_ntfsprogs-$(NTFS_3G_VER)
        $(TOUCH)
 
 $(D)/autofs:
@@ -274,7 +271,7 @@ $(D)/autofs5: $(D)/libtirpc $(ARCHIVE)/autofs-$(AUTOFS5_VER).tar.gz | $(TARGETPR
                autoreconf -fi && \
                $(CONFIGURE) \
                        --prefix= \
-                       --datarootdir=$(BUILD_TMP)/.remove \
+                       --datarootdir=/.remove \
                        --disable-mount-locking \
                        --without-openldap \
                        --without-sasl \
@@ -315,13 +312,12 @@ $(D)/gdb: $(ARCHIVE)/gdb-$(GDB_VER).tar.xz | $(TARGETPREFIX)
                ./configure \
                        --nfp --disable-werror \
                        --prefix= \
-                       --mandir=$(BUILD_TMP)/.remove \
-                       --infodir=$(BUILD_TMP)/.remove \
+                       --mandir=/.remove \
+                       --infodir=/.remove \
                        --build=$(BUILD) --host=$(TARGET) && \
                $(MAKE) all-gdb && \
                $(MAKE) install-gdb prefix=$(TARGETPREFIX) && \
        $(REMOVE)/gdb-$(GDB_VER)
-       $(REMOVE)/.remove
        $(TOUCH)
 
 #  NOTE:
@@ -367,7 +363,7 @@ $(D)/mtd-utils: $(ARCHIVE)/mtd-utils-$(MTD_UTILS_VER).tar.bz2 $(D)/zlib | $(TARG
                mkdir -p $(TARGETPREFIX)/sbin; \
                $(TARGET)-strip $(MTD_BUILDS); \
                cp -a $(MTD_BUILDS) $(TARGETPREFIX)/sbin; \
-       $(REMOVE)/mtd-utils-$(MTD_UTILS_VER) $(BUILD_TMP)/.remove
+       $(REMOVE)/mtd-utils-$(MTD_UTILS_VER)
        $(TOUCH)        
 
 # SAMBA
@@ -682,13 +678,12 @@ $(D)/motion: $(ARCHIVE)/motion-3.2.12.tar.gz | $(TARGETPREFIX)
        $(START_BUILD)
        $(UNTAR)/motion-3.2.12.tar.gz
        pushd $(BUILD_TMP)/motion-3.2.12 && \
-               $(BUILDENV) CC=$(TARGET)-gcc ./configure --prefix=$(TARGETPREFIX) --build=$(BUILD) --host=$(TARGET) --mandir=$(TARGETPREFIX)/.remove --docdir=$(TARGETPREFIX)/.remove && \
+               $(BUILDENV) CC=$(TARGET)-gcc ./configure --prefix=$(TARGETPREFIX) --build=$(BUILD) --host=$(TARGET) --mandir=/.remove --docdir=/.remove && \
        $(MAKE) all && \
        $(MAKE) install
        cp -f $(TARGETPREFIX)/etc/motion-dist.conf $(TARGETPREFIX)/etc/motion.conf
        rm -f $(TARGETPREFIX)/etc/motion-dist.conf
        rm -f -r $(TARGETPREFIX)/usr/share/motion-3.2.12
-       rm -f -r $(TARGETPREFIX)/.remove
        $(REMOVE)/motion-3.2.12
        $(TOUCH)
 
@@ -829,7 +824,7 @@ $(D)/mc: $(D)/libncurses $(D)/libglib2 $(ARCHIVE)/mc-$(MC_VER).tar.xz | $(TARGET
                $(MAKE) install DESTDIR=$(TARGETPREFIX)
        rm -rf $(TARGETPREFIX)/usr/share/mc/examples
        find $(TARGETPREFIX)/usr/share/mc/skins -type f ! -name default.ini | xargs --no-run-if-empty rm
-       $(REMOVE)/mc-$(MC_VER) $(TARGETPREFIX)/.remove
+       $(REMOVE)/mc-$(MC_VER)
        $(TOUCH)
 
 #

diff --git a/make/environment.mk b/make/environment.mk
index c8f8218f239e6b7d8fcd5ad5fd0201f6f470b6ff..24313324585175f36c9600f1cef1f46a0dc65d72 100755 (executable)
--- a/make/environment.mk
+++ b/make/environment.mk
@@ -167,7 +167,7 @@ REWRITE_LIBTOOLDEP = sed -i -e "s,\(^dependency_libs='\| \|-L\|^dependency_libs=
 REWRITE_PKGCONF    = sed -i "s,^prefix=.*,prefix='$(TARGETPREFIX)',"
 # unpack tarballs, clean up
 UNTAR = tar -C $(BUILD_TMP) -xf $(ARCHIVE)
-REMOVE = rm -rf $(BUILD_TMP)
+REMOVE = rm -rf $(BUILD_TMP)/.remove $(TARGETPREFIX)/.remove $(BUILD_TMP)
 PATCH = patch -p1 -i $(PATCHES)
 
 #

diff --git a/make/ffmpeg.mk b/make/ffmpeg.mk
index 555d9319653a7f589363f5f369044b95702b3c0f..62c8e0ac68302aa9a0780e51dd4829a15d52f52b 100644 (file)
--- a/make/ffmpeg.mk
+++ b/make/ffmpeg.mk
@@ -467,7 +467,7 @@ ffmpeg-armbox: $(ARCHIVE)/ffmpeg-$(FFMPEG_VER).tar.xz | $(TARGETPREFIX)
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavutil.pc
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libswresample.pc
        test -e $(PKG_CONFIG_PATH)/libswscale.pc && $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libswscale.pc || true
-       $(REMOVE)/ffmpeg-$(FFMPEG_VER) $(TARGETPREFIX)/.remove
+       $(REMOVE)/ffmpeg-$(FFMPEG_VER)
 
 ffmpeg-coolstream: $(ARCHIVE)/ffmpeg-git-$(FFMPEG_GIT).tar.gz | $(TARGETPREFIX)
        $(START_BUILD)
@@ -503,7 +503,7 @@ ffmpeg-coolstream: $(ARCHIVE)/ffmpeg-git-$(FFMPEG_GIT).tar.gz | $(TARGETPREFIX)
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libavutil.pc
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libswresample.pc
        test -e $(PKG_CONFIG_PATH)/libswscale.pc && $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libswscale.pc || true
-       $(REMOVE)/ffmpeg-git-$(FFMPEG_GIT) $(TARGETPREFIX)/.remove
+       $(REMOVE)/ffmpeg-git-$(FFMPEG_GIT)
 
 $(D)/ffmpeg: $(D)/librtmp $(D)/libxml2 $(D)/libroxml $(FFMPEG_DEP) ffmpeg-$(BOXTYPE)
        $(TOUCH)

diff --git a/make/libraries.mk b/make/libraries.mk
index 7ae95d994116d6c21d5799a46d893e00578a634d..53c04474a2b525bcd5543842aca55ae04e295149 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -88,7 +88,6 @@ $(D)/libuuid: $(ARCHIVE)/util-linux-2.20.tar.bz2 | $(TARGETPREFIX)
                $(MAKE) -C libblkid install DESTDIR=$(TARGETPREFIX)
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/uuid.pc
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/blkid.pc
-       rm -rf $(TARGETPREFIX)/.remove
        $(REMOVE)/util-linux-2.20
        $(TOUCH)
 
@@ -200,7 +199,6 @@ $(D)/giflib: $(ARCHIVE)/giflib-$(GIFLIB_VER).tar.bz2 | $(TARGETPREFIX)
                $(MAKE) all && \
                $(MAKE) install DESTDIR=$(TARGETPREFIX)
        $(REWRITE_LIBTOOL)/libgif.la
-       rm -rf $(TARGETPREFIX)/.remove
        $(REMOVE)/giflib-$(GIFLIB_VER)
        $(TOUCH)
 
@@ -215,7 +213,6 @@ $(D)/libungif: $(ARCHIVE)/libungif-4.1.4.tar.bz2 | $(TARGETPREFIX)
                $(MAKE) all && \
                $(MAKE) install DESTDIR=$(TARGETPREFIX)
        $(REWRITE_LIBTOOL)/libungif.la
-       rm -rf $(TARGETPREFIX)/.remove
        $(REMOVE)/libungif-4.1.4
        $(TOUCH)
 
@@ -232,7 +229,7 @@ $(D)/openssl: $(ARCHIVE)/openssl-$(OPENSSL_VER)$(OPENSSL_SUBVER).tar.gz | $(TARG
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/openssl.pc
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libcrypto.pc
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libssl.pc
-       rm -r $(TARGETPREFIX)/.remove $(TARGETPREFIX)/bin/openssl $(TARGETPREFIX)/bin/c_rehash $(TARGETPREFIX)/lib/engines
+       rm -r $(TARGETPREFIX)/bin/openssl $(TARGETPREFIX)/bin/c_rehash $(TARGETPREFIX)/lib/engines
        $(REMOVE)/openssl-$(OPENSSL_VER)$(OPENSSL_SUBVER)
        pushd $(TARGETPREFIX)/lib && \
                if [ "$(OPENSSL_VER)" = "1.0.1" -o "$(OPENSSL_VER)" = "1.0.2" ]; then \
@@ -287,14 +284,12 @@ $(D)/libcurl: $(ARCHIVE)/curl-$(CURL_VER).tar.bz2 $(D)/openssl $(D)/librtmp $(D)
        rm $(TARGETPREFIX)/bin/curl-config
        $(REWRITE_LIBTOOL)/libcurl.la
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libcurl.pc
-       rm -rf $(TARGETPREFIX)/.remove
        $(REMOVE)/curl-$(CURL_VER)
        $(TOUCH)
 
 $(D)/librtmp: $(D)/zlib $(D)/openssl $(ARCHIVE)/rtmpdump-$(LIBRTMP_VER).tar.gz | $(TARGETPREFIX)
        $(START_BUILD)
        mkdir $(BUILD_TMP)/rtmpdump-$(LIBRTMP_VER);\
-       mkdir $(TARGETPREFIX)/.remove ;\
        cd $(BUILD_TMP)/rtmpdump-$(LIBRTMP_VER);\
        tar -xf $(ARCHIVE)/rtmpdump-$(LIBRTMP_VER).tar.gz ;\
        set -e; cd $(BUILD_TMP)/rtmpdump-$(LIBRTMP_VER); \
@@ -309,7 +304,6 @@ $(D)/librtmp: $(D)/zlib $(D)/openssl $(ARCHIVE)/rtmpdump-$(LIBRTMP_VER).tar.gz |
                        sbindir=/.remove \
                        mandir=/.remove
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/librtmp.pc
-       rm -rf $(TARGETPREFIX)/.remove
        $(REMOVE)/rtmpdump-$(LIBRTMP_VER)
        $(TOUCH)
 
@@ -352,7 +346,7 @@ $(D)/libpng: $(D)/zlib $(ARCHIVE)/libpng-$(LIBPNG_VER).tar.xz | $(TARGETPREFIX)
                        --build=$(BUILD) \
                        --host=$(TARGET) \
                        --bindir=$(HOSTPREFIX)/bin \
-                       --mandir=$(BUILD_TMP)/.remove \
+                       --mandir=/.remove \
                        --enable-silent-rules \
                        --disable-arm-neon \
                        --disable-static && \
@@ -410,7 +404,6 @@ $(D)/libxml2: $(ARCHIVE)/libxml2-$(LIBXML2_VER).tar.gz | $(TARGETPREFIX)
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libxml-2.0.pc
        rm -rf $(TARGETPREFIX)/lib/xml2Conf.sh
        rm -rf $(TARGETPREFIX)/bin/xml2-config
-       rm -rf $(TARGETPREFIX)/.remove
        $(REMOVE)/libxml2-$(LIBXML2_VER)
        $(TOUCH)
 
@@ -439,7 +432,6 @@ $(D)/libxslt: $(D)/libxml2 $(ARCHIVE)/libxslt-git-snapshot.tar.gz | $(TARGETPREF
        rm -rf $(TARGETPREFIX)/lib/libxslt-plugins/
        rm -rf $(TARGETPREFIX)/lib/xsltConf.sh
        rm -rf $(TARGETPREFIX)/bin/xslt-config
-       rm -rf $(TARGETPREFIX)/.remove
        $(REMOVE)/libxslt-1.1.28
        $(TOUCH)
 
@@ -603,7 +595,6 @@ $(D)/libiconv: $(ARCHIVE)/libiconv-1.14.tar.gz | $(TARGETPREFIX)
                $(MAKE) && \
                $(MAKE) install DESTDIR=$(TARGETPREFIX)
        rm -fr $(TARGETPREFIX)/lib/preloadable_libiconv.so
-       rm -fr $(TARGETPREFIX)/.remove
        $(REMOVE)/libiconv-1.14
        $(REWRITE_LIBTOOL)/libiconv.la
        $(TOUCH)
@@ -671,7 +662,6 @@ $(D)/libgd2: $(D)/zlib $(D)/libpng $(D)/libjpeg $(D)/freetype $(LIBICONV) $(ARCH
                $(MAKE) && \
                $(MAKE) install DESTDIR=$(TARGETPREFIX)
        $(REMOVE)/gd-$(GD_VER)
-       rm -rf $(TARGETPREFIX)/.remove
        $(REWRITE_LIBTOOL)/libgd.la
        $(TOUCH)
 
@@ -726,7 +716,6 @@ $(D)/expat: $(ARCHIVE)/expat-$(EXPAT_VER).tar.bz2 | $(TARGETPREFIX)
                        ; \
                $(MAKE); \
                make install DESTDIR=$(TARGETPREFIX)
-       rm -fr $(TARGETPREFIX)/.remove
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/expat.pc
        $(REWRITE_LIBTOOL)/libexpat.la
        rm -fr $(BUILD_TMP)/expat-$(EXPAT_VER) $(PKGPREFIX)
@@ -810,7 +799,7 @@ $(D)/luaposix: $(HOSTPREFIX)/bin/lua-$(LUA_VER) $(D)/lua $(ARCHIVE)/luaposix-31.
                        --without-ncursesw; \
                $(MAKE); \
                $(MAKE) all check install DESTDIR=$(TARGETPREFIX)
-       $(REMOVE)/luaposix-31 $(TARGETPREFIX)/.remove
+       $(REMOVE)/luaposix-31
        $(TOUCH)
 
 # helper for luaposix build
@@ -821,7 +810,7 @@ $(HOSTPREFIX)/bin/lua-$(LUA_VER): $(ARCHIVE)/lua-$(LUA_VER).tar.gz | $(TARGETPRE
                $(PATCH)/lua-01-fix-coolstream-build.patch; \
                $(MAKE) linux
        install -m 0755 -D $(BUILD_TMP)/lua-$(LUA_VER)/src/lua $@
-       $(REMOVE)/lua-$(LUA_VER) $(TARGETPREFIX)/.remove
+       $(REMOVE)/lua-$(LUA_VER)
 
 $(D)/lua: $(D)/libncurses $(ARCHIVE)/lua-$(LUA_VER).tar.gz | $(TARGETPREFIX)
        $(START_BUILD)
@@ -842,7 +831,7 @@ $(D)/lua: $(D)/libncurses $(ARCHIVE)/lua-$(LUA_VER).tar.gz | $(TARGETPREFIX)
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/lua.pc
        rm -rf $(TARGETPREFIX)/bin/lua
        rm -rf $(TARGETPREFIX)/bin/luac
-       $(REMOVE)/lua-$(LUA_VER) $(TARGETPREFIX)/.remove
+       $(REMOVE)/lua-$(LUA_VER)
        $(TOUCH)
 
 $(D)/libflex: $(ARCHIVE)/flex-$(FLEX_VER).tar.gz
@@ -854,7 +843,6 @@ $(D)/libflex: $(ARCHIVE)/flex-$(FLEX_VER).tar.gz
                $(CONFIGURE) -C --host=$(TARGET) --target=$(TARGET) --prefix= --bindir=/.remove --mandir=/.remove --infodir=/.remove --disable-nls; \
                $(MAKE); \
                $(MAKE) install DESTDIR=$(TARGETPREFIX)
-       rm -fr $(TARGETPREFIX)/.remove
        $(REMOVE)/flex-$(FLEX_VER)
        $(TOUCH)
 
@@ -883,7 +871,6 @@ $(D)/gettext: $(ARCHIVE)/gettext-$(GETTEXT_VER).tar.xz | $(TARGETPREFIX)
        $(REWRITE_LIBTOOL)/libgettextpo.la
        $(REWRITE_LIBTOOL)/libgettextsrc.la
        $(REWRITE_LIBTOOL)/libintl.la
-       rm -fr $(TARGETPREFIX)/.remove
        $(REMOVE)/gettext-$(GETTEXT_VER)
        $(TOUCH)
 
@@ -989,7 +976,7 @@ $(D)/libglib2: $(D)/zlib $(D)/libffi $(D)/gettext $(ARCHIVE)/glib-$(LIBGLIB2_VER
        $(REWRITE_LIBTOOLDEP)/libgobject-2.0.la
        $(REWRITE_LIBTOOLDEP)/libgthread-2.0.la
        rm -rf $(TARGETLIB)/libgio* $(TARGETLIB)/libgmodule* $(TARGETLIB)/libgobject* $(TARGETLIB)/libgthread*
-       $(REMOVE)/glib-$(LIBGLIB2_VER) $(TARGETPREFIX)/.remove
+       $(REMOVE)/glib-$(LIBGLIB2_VER)
        $(TOUCH)
 
 $(D)/timezone: $(ARCHIVE)/tzdata$(TZ_VER).tar.gz | find-zic $(TARGETPREFIX)

diff --git a/make/plugins.mk b/make/plugins.mk
index 3e3f8aa5a65f660b98ccfe29326059e142a5f52a..261cf988195b0af5ed6c3bc5174cee6d4a77366a 100644 (file)
--- a/make/plugins.mk
+++ b/make/plugins.mk
@@ -152,7 +152,7 @@ $(D)/links:
                        --host=$(TARGET) \
                        --build=$(BUILD) \
                        --prefix= \
-                       --mandir=$(BUILD_TMP)/.remove \
+                       --mandir=/.remove \
                        --without-svgalib \
                        --without-directfb \
                        --without-x \
@@ -174,7 +174,6 @@ $(D)/links:
        echo "needoffsets=1"            >> $(TARGETPREFIX)/lib/tuxbox/plugins/links.cfg
        echo "bookmarkcount=0"           > $(TARGETPREFIX)/var/tuxbox/config/bookmarks
        cp -rf $(BASE_DIR)/archive-sources/links $(TARGETPREFIX)/var/tuxbox/config
-       rm -rf $(BUILD_TMP)/.remove
        $(REMOVE)/links
        $(TOUCH)