From 27d41ace94b8b74f3e5bcd47ea55b5060ffa2f9c Mon Sep 17 00:00:00 2001
From: Bernhard Reutner-Fischer
Date: Fri, 15 Dec 2006 14:18:30 +0000
Subject: - use one (patched) sourcedir and build the -host and -target
 fakeroute in their   own dirs. Thanks to Ulrich Hecht.

---
 package/fakeroot/fakeroot.mk | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'package/fakeroot')

diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk
index 5b22ee94c..57fbb05bf 100644
--- a/package/fakeroot/fakeroot.mk
+++ b/package/fakeroot/fakeroot.mk
@@ -7,8 +7,9 @@ FAKEROOT_VERSION:=1.5.8
 FAKEROOT_SOURCE:=fakeroot_$(FAKEROOT_VERSION).tar.gz
 FAKEROOT_SITE:=http://ftp.debian.org/debian/pool/main/f/fakeroot
 FAKEROOT_CAT:=$(ZCAT)
-FAKEROOT_DIR1:=$(TOOL_BUILD_DIR)/fakeroot-$(FAKEROOT_VERSION)
-FAKEROOT_DIR2:=$(BUILD_DIR)/fakeroot-$(FAKEROOT_VERSION)
+FAKEROOT_SOURCE_DIR:=$(BUILD_DIR)/fakeroot-$(FAKEROOT_VERSION)
+FAKEROOT_DIR1:=$(TOOL_BUILD_DIR)/fakeroot-$(FAKEROOT_VERSION)-host
+FAKEROOT_DIR2:=$(BUILD_DIR)/fakeroot-$(FAKEROOT_VERSION)-target
 
 
 $(DL_DIR)/$(FAKEROOT_SOURCE):
@@ -16,23 +17,26 @@ $(DL_DIR)/$(FAKEROOT_SOURCE):
 
 fakeroot-source: $(DL_DIR)/$(FAKEROOT_SOURCE)
 
+$(FAKEROOT_SOURCE_DIR)/.unpacked: $(DL_DIR)/$(FAKEROOT_SOURCE)
+	$(FAKEROOT_CAT) $(DL_DIR)/$(FAKEROOT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	# If using busybox getopt, make it be quiet.
+	$(SED) "s,getopt --version,getopt --version 2>/dev/null," \
+		$(FAKEROOT_SOURCE_DIR)/scripts/fakeroot.in
+	toolchain/patch-kernel.sh $(FAKEROOT_SOURCE_DIR) package/fakeroot/ \*.patch
+	touch $(FAKEROOT_SOURCE_DIR)/.unpacked
+
 
 #############################################################
 #
 # build fakeroot for use on the host system
 #
 #############################################################
-$(FAKEROOT_DIR1)/.unpacked: $(DL_DIR)/$(FAKEROOT_SOURCE)
-	$(FAKEROOT_CAT) $(DL_DIR)/$(FAKEROOT_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
-	$(SED) "s,getopt --version,getopt --version 2>/dev/null," \
-		$(FAKEROOT_DIR1)/scripts/fakeroot.in
-	toolchain/patch-kernel.sh $(FAKEROOT_DIR1) package/fakeroot/ \*.patch
-	touch $(FAKEROOT_DIR1)/.unpacked
 
-$(FAKEROOT_DIR1)/.configured: $(FAKEROOT_DIR1)/.unpacked
+$(FAKEROOT_DIR1)/.configured: $(FAKEROOT_SOURCE_DIR)/.unpacked
+	mkdir -p $(FAKEROOT_DIR1)
 	(cd $(FAKEROOT_DIR1); rm -rf config.cache; \
 		CC="$(HOSTCC)" \
-		./configure \
+		$(FAKEROOT_SOURCE_DIR)/configure \
 		--prefix=/usr \
 		$(DISABLE_NLS) \
 	);
@@ -61,17 +65,12 @@ host-fakeroot-dirclean:
 # build fakeroot for use on the target system
 #
 #############################################################
-$(FAKEROOT_DIR2)/.unpacked: $(DL_DIR)/$(FAKEROOT_SOURCE)
-	$(FAKEROOT_CAT) $(DL_DIR)/$(FAKEROOT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	# If using busybox getopt, make it be quiet.
-	$(SED) "s,getopt --version,getopt --version 2>/dev/null," \
-		$(FAKEROOT_DIR2)/scripts/fakeroot.in
-	touch $(FAKEROOT_DIR2)/.unpacked
 
-$(FAKEROOT_DIR2)/.configured: $(FAKEROOT_DIR2)/.unpacked
+$(FAKEROOT_DIR2)/.configured: $(FAKEROOT_SOURCE_DIR)/.unpacked
+	mkdir -p $(FAKEROOT_DIR2)
 	(cd $(FAKEROOT_DIR2); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
-		./configure \
+		$(FAKEROOT_SOURCE_DIR)/configure \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
@@ -103,6 +102,7 @@ fakeroot: uclibc $(TARGET_DIR)/usr/bin/fakeroot
 
 fakeroot-clean:
 	$(MAKE) -C $(FAKEROOT_DIR2) clean
+	rm -f $(TARGET_DIR)/usr/bin/fake{d,root}
 
 fakeroot-dirclean:
 	rm -rf $(FAKEROOT_DIR2)
-- 
cgit v1.2.3-55-g7522