From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 15 Jul 2009 22:26:16 +0000 (+0200)
Subject: Added autoconf and automake to toolchain.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=caaa4007168cdb0b339fc9014f55661aad9fed15;p=ipfire-3.x.git

Added autoconf and automake to toolchain.
---

diff --git a/lfs/autoconf b/lfs/autoconf
index aff1431bc..a0f88ecf7 100644
--- a/lfs/autoconf
+++ b/lfs/autoconf
@@ -81,11 +81,24 @@ $(objects):
 $(OBJECT): $(objects)
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
+
+ifeq "$(STAGE)" "toolchain"
+	cd $(DIR_APP) && \
+		./configure \
+			$(CONFIGURE_ARCH) \
+			--prefix=$(TOOLS_DIR)
+	cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+	cd $(DIR_APP) && make install
+endif
+
+ifeq "$(STAGE)" "base"
 	cd $(DIR_APP) && \
 		./configure \
 			$(CONFIGURE_ARCH) \
 			--prefix=/usr
 	cd $(DIR_APP) && make #$(PARALLELISMFLAGS)
 	cd $(DIR_APP) && make install
+endif
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/lfs/automake b/lfs/automake
index 07d02f978..6f1620322 100644
--- a/lfs/automake
+++ b/lfs/automake
@@ -79,11 +79,25 @@ $(objects):
 $(OBJECT): $(objects)
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
+
+ifeq "$(STAGE)" "toolchain"
+	cd $(DIR_APP) && \
+		./configure \
+			$(CONFIGURE_ARCH) \
+			--prefix=$(TOOLS_DIR)
+	cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+	cd $(DIR_APP) && make install
+endif
+
+
+ifeq "$(STAGE)" "base"
 	cd $(DIR_APP) && \
 		./configure \
 			$(CONFIGURE_ARCH) \
 			--prefix=/usr
 	cd $(DIR_APP) && make $(PARALLELISMFLAGS)
 	cd $(DIR_APP) && make install
+endif
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)