From 5d2be049791872cd2a66a4ef80bd22e199d9c876 Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Thu, 16 Aug 2007 18:19:42 +0000 Subject: Move fakeroot temps from STAGING_DIR to PROJECT_BUILD_DIR --- package/at/at.mk | 4 ++-- package/ltp-testsuite/ltp-testsuite.mk | 2 +- package/nfs-utils/nfs-utils.mk | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'package') diff --git a/package/at/at.mk b/package/at/at.mk index 0ce088636..296da2ea3 100644 --- a/package/at/at.mk +++ b/package/at/at.mk @@ -49,8 +49,8 @@ $(TARGET_DIR)/$(AT_TARGET_SCRIPT): $(AT_DIR)/$(AT_BINARY) # Use fakeroot to pretend to do 'make install' as root echo '$(MAKE) DAEMON_USERNAME=root DAEMON_GROUPNAME=root ' \ '$(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) -C $(AT_DIR) install' \ - > $(STAGING_DIR)/.fakeroot.at - echo 'rm -rf $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/doc/at' >> $(STAGING_DIR)/.fakeroot.at + > $(PROJECT_BUILD_DIR)/.fakeroot.at + echo 'rm -rf $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/doc/at' >> $(PROJECT_BUILD_DIR)/.fakeroot.at $(INSTALL) -m 0755 -D $(AT_DIR)/debian/rc $(TARGET_DIR)/$(AT_TARGET_SCRIPT) at: uclibc host-fakeroot $(TARGET_DIR)/$(AT_TARGET_SCRIPT) diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index 575a2eea2..706787fbf 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -47,7 +47,7 @@ $(LTP_TESTSUITE_DIR)/.installed: $(LTP_TESTSUITE_DIR)/.compiled # Use fakeroot to pretend to do 'make install' as root echo '$(MAKE1) $(TARGET_CONFIGURE_OPTS) CROSS_COMPILER=$(TARGET_CROSS) ' \ '-C $(LTP_TESTSUITE_DIR) install' \ - > $(STAGING_DIR)/.fakeroot.ltp + > $(PROJECT_BUILD_DIR)/.fakeroot.ltp touch $@ ltp-testsuite: uclibc host-fakeroot $(LTP_TESTSUITE_DIR)/.installed diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 3dc901324..2fe86b499 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -59,7 +59,7 @@ NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPCDEBUG) += usr/sbin/rpcdebug NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_LOCKD) += usr/sbin/rpc.lockd NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD) += usr/sbin/rpc.rquotad -$(STAGING_DIR)/.fakeroot.nfs-utils: $(NFS_UTILS_DIR)/$(NFS_UTILS_BINARY) +$(PROJECT_BUILD_DIR)/.fakeroot.nfs-utils: $(NFS_UTILS_DIR)/$(NFS_UTILS_BINARY) # Use fakeroot to pretend to do 'make install' as root echo '$(MAKE) prefix=$(TARGET_DIR)/usr statedir=$(TARGET_DIR)/var/lib/nfs $(TARGET_CONFIGURE_OPTS) -C $(NFS_UTILS_DIR) install' > $@ echo 'rm -f $(TARGET_DIR)/usr/bin/event_rpcgen.py $(TARGET_DIR)/usr/sbin/nhfs* $(TARGET_DIR)/usr/sbin/nfsstat $(TARGET_DIR)/usr/sbin/showmount' >> $@ @@ -70,7 +70,7 @@ $(STAGING_DIR)/.fakeroot.nfs-utils: $(NFS_UTILS_DIR)/$(NFS_UTILS_BINARY) echo "file; done" >> $@ echo 'rm -rf $(TARGET_DIR)/var/lib/nfs' >> $@ -$(TARGET_DIR)/$(NFS_UTILS_TARGET_BINARY): $(STAGING_DIR)/.fakeroot.nfs-utils +$(TARGET_DIR)/$(NFS_UTILS_TARGET_BINARY): $(PROJECT_BUILD_DIR)/.fakeroot.nfs-utils touch -c $@ nfs-utils: uclibc host-fakeroot $(TARGET_DIR)/$(NFS_UTILS_TARGET_BINARY) @@ -81,7 +81,7 @@ nfs-utils-clean: rm -f $(TARGET_DIR)/$$file; \ done -$(MAKE) -C $(NFS_UTILS_DIR) clean - rm -f $(STAGING_DIR)/.fakeroot.nfs-utils + rm -f $(PROJECT_BUILD_DIR)/.fakeroot.nfs-utils nfs-utils-dirclean: rm -rf $(NFS_UTILS_DIR) -- cgit v1.2.3