X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Ftcl;h=a62b4e6b052101953bad19b923a46e70ba27ef99;hp=6b1e7cf8f64a5f784eee48c117e8d8694180e70f;hb=d1c956e88e2dcd4c6bb282d112fede7f9b409bf9;hpb=c5fdda6df055ed9308975028afc8d6d507672fd6

diff --git a/lfs/tcl b/lfs/tcl
index 6b1e7cf8f6..a62b4e6b05 100644
--- a/lfs/tcl
+++ b/lfs/tcl
@@ -30,7 +30,12 @@ THISAPP    = tcl$(VER)
 DL_FILE    = $(THISAPP)-src.tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
+
+ifeq "$(LFS_PASS)" "toolchain"
 TARGET     = $(DIR_INFO)/$(THISAPP)-tools
+else
+TARGET     = $(DIR_INFO)/$(THISAPP)
+endif
 
 ###############################################################################
 # Top-level Rules
@@ -70,10 +75,18 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ifeq "$(LFS_PASS)" "toolchain"
 	cd $(DIR_APP)/unix && ./configure --prefix=/tools --disable-nls
+else
+	cd $(DIR_APP)/unix && ./configure --prefix=/usr --disable-nls
+endif
 	cd $(DIR_APP)/unix && make $(MAKETUNING)
 	cd $(DIR_APP)/unix && make install
+ifeq "$(LFS_PASS)" "toolchain"
 	cd $(DIR_APP)/unix && make install-private-headers
 	ln -sf tclsh8.4 /tools/bin/tclsh
+else
+	ln -sf tclsh8.4 /usr/bin/tclsh
+endif
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)