From 97a83876d52a18f74ead1e32758cbfb32d51ec5c Mon Sep 17 00:00:00 2001 From: Markham Date: Sun, 9 Sep 2018 21:31:24 +0200 Subject: [PATCH] fix 'remove' in view targets --- make/applications.mk | 4 +--- make/libraries.mk | 7 +++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/make/applications.mk b/make/applications.mk index 9568111..7cc0dfc 100755 --- a/make/applications.mk +++ b/make/applications.mk @@ -125,7 +125,6 @@ $(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) $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/uuid.pc $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/blkid.pc $(REMOVE)/e2fsprogs-$(E2FSPROGS_VER) @@ -398,7 +397,7 @@ endif $(D)/mtd-utils: $(ARCHIVE)/mtd-utils-$(MTD_UTILS_VER).tar.bz2 $(D)/zlib | $(TARGETPREFIX) $(START_BUILD) # build for target - rm -fr $(BUILD_TMP)/mtd-utils-$(MTD_UTILS_VER); \ + $(REMOVE)/mtd-utils-$(MTD_UTILS_VER); \ $(UNTAR)/mtd-utils-$(MTD_UTILS_VER).tar.bz2; \ set -e; cd $(BUILD_TMP)/mtd-utils-$(MTD_UTILS_VER); \ $(MAKE) $(MTD_BUILDS) BUILDDIR=$(MTD_BUILDDIR) WITHOUT_XATTR=1 WITHOUT_LZO=1 \ @@ -992,6 +991,5 @@ $(D)/unfsd: $(D)/libflex $(D)/portmap $(ARCHIVE)/unfs3-$(UNFS3_VER).tar.gz $(MAKE); \ $(MAKE) install DESTDIR=$(TARGETPREFIX) $(TARGET)-strip $(TARGETPREFIX)/sbin/unfsd - rm -f -r $(TARGETPREFIX)/.remove $(REMOVE)/unfs3-$(UNFS3_VER) $(TOUCH) diff --git a/make/libraries.mk b/make/libraries.mk index d897d14..033bd6d 100755 --- a/make/libraries.mk +++ b/make/libraries.mk @@ -887,7 +887,6 @@ $(D)/libflac: $(ARCHIVE)/flac-1.3.0.tar.gz | $(TARGETPREFIX) $(D)/expat: $(ARCHIVE)/expat-$(EXPAT_VER).tar.bz2 | $(TARGETPREFIX) $(START_BUILD) - rm -fr $(BUILD_TMP)/expat-$(EXPAT_VER) $(UNTAR)/expat-$(EXPAT_VER).tar.bz2 set -e; cd $(BUILD_TMP)/expat-$(EXPAT_VER); \ $(CONFIGURE) \ @@ -901,7 +900,7 @@ $(D)/expat: $(ARCHIVE)/expat-$(EXPAT_VER).tar.bz2 | $(TARGETPREFIX) make install DESTDIR=$(TARGETPREFIX) $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/expat.pc $(REWRITE_LIBTOOL)/libexpat.la - rm -fr $(BUILD_TMP)/expat-$(EXPAT_VER) $(PKGPREFIX) + $(REMOVE)/expat-$(EXPAT_VER) $(TOUCH) $(D)/lua-expat: $(ARCHIVE)/luaexpat-$(LUA_EXPAT_VER).tar.gz $(D)/expat | $(TARGETPREFIX) @@ -914,7 +913,7 @@ $(D)/lua-expat: $(ARCHIVE)/luaexpat-$(LUA_EXPAT_VER).tar.gz $(D)/expat | $(TARGE LUA_INC=-I$(TARGETPREFIX)/include EXPAT_INC=-I$(TARGETPREFIX)/include; \ $(MAKE) install LUA_LDIR=$(TARGETPREFIX)/share/lua/$(LUA_ABIVER) LUA_CDIR=$(TARGETPREFIX)/lib/lua/$(LUA_ABIVER) rm -fr $(TARGETPREFIX)/share/lua/$(LUA_ABIVER)/lxp/tests - rm -fr $(BUILD_TMP)/luaexpat-$(LUA_EXPAT_VER) + $(REMOVE)/luaexpat-$(LUA_EXPAT_VER) $(TOUCH) $(D)/lua-feedparser: $(ARCHIVE)/lua-feedparser-$(LUA_FEEDPARSER_VER).tar.bz2 $(D)/lua $(D)/luasocket $(D)/lua-expat | $(TARGETPREFIX) @@ -939,7 +938,7 @@ $(D)/luasocket: $(ARCHIVE)/Luasocket-$(LUASOCKET_VER)-git-$(LUASOCKET_GIT).tar.b $(MAKE) install \ LUAV=$(LUA_ABIVER) LUAPREFIX_linux= \ CDIR_linux=$(TARGETPREFIX)/lib/lua/$(LUA_ABIVER) LDIR_linux=$(TARGETPREFIX)/share/lua/$(LUA_ABIVER); \ - rm -fr $(BUILD_TMP)/Luasocket-$(LUASOCKET_VER)-git-$(LUASOCKET_GIT) + $(REMOVE)/Luasocket-$(LUASOCKET_VER)-git-$(LUASOCKET_GIT) $(TOUCH) $(D)/luacurl: $(D)/libcurl $(ARCHIVE)/Lua-cURL$(LUACURL_VER)-git-$(LUACURL_GIT).tar.bz2 | $(TARGETPREFIX) -- 2.39.5