r1285 - in trunk/packages: expect tcl

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Sun Dec 18 15:34:18 PST 2005


Author: thomasp
Date: 2005-12-18 16:34:16 -0700 (Sun, 18 Dec 2005)
New Revision: 1285

Modified:
   trunk/packages/expect/Makefile
   trunk/packages/tcl/Makefile
Log:
Updated tcl and expect instructions to match LFS development

Modified: trunk/packages/expect/Makefile
===================================================================
--- trunk/packages/expect/Makefile	2005-12-18 01:50:40 UTC (rev 1284)
+++ trunk/packages/expect/Makefile	2005-12-18 23:34:16 UTC (rev 1285)
@@ -19,16 +19,15 @@
 stage1: $(FILE) $(PATCH1)
 	$(std_build)
 	cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)
-	make -C ../tcl clean
 
 compile-stage1:
 	patch -Np1 -i ../$(PATCH1)
 ifndef CROSS
 	./configure --prefix=$(WD) --with-tcl=$(WD)/lib \
-	--with-tclinclude=$(ROOT)/$(PKG)/tcl/tcl8.4.11 --with-x=no
+	--with-tclinclude=$(WD)/include --with-x=no
 else
 	CC="gcc $(64FLAGS)" ./configure --prefix=$(WD) --with-tcl=$(WD)/lib64 \
-	--with-tclinclude=$(ROOT)/$(PKG)/tcl/tcl8.4.11 --libdir=$(WD)/lib64 \
+	--with-tclinclude=$(WD)/include --libdir=$(WD)/lib64 \
 	--with-x=no
 endif
 	make $(PM)

Modified: trunk/packages/tcl/Makefile
===================================================================
--- trunk/packages/tcl/Makefile	2005-12-18 01:50:40 UTC (rev 1284)
+++ trunk/packages/tcl/Makefile	2005-12-18 23:34:16 UTC (rev 1285)
@@ -13,7 +13,7 @@
 include $(ROOT)/scripts/functions
 
 stage1: $(FILE)
-	$(std_build_noclean)
+	$(std_build)
 	cp $(SRC)/$(FILE) $(LFSSRC)/
 
 compile-stage1:
@@ -21,11 +21,12 @@
 ifndef CROSS
 	cd unix ; ./configure --prefix=$(WD)
 else
-	cd unix ; sed -i 's@\$(prefix)/lib@\$(prefix)/lib64 at g' Makefile.in
-	cd unix ; CC="gcc $(64FLAGS)" ./configure --prefix=/tools --libdir=/tools/lib64
+	cd unix ; sed -i 's@\$$(prefix)/lib@\$$(prefix)/lib64 at g' Makefile.in
+	cd unix ; CC="gcc $(64FLAGS)" ./configure --prefix=/tools --libdir=$(WD)/lib64
 endif
 	cd unix ; make $(PM)
 	cd unix ; make install
+	cd unix ; make install-private-headers
 	ln -s tclsh8.4 $(WD)/bin/tclsh
 
 clean:




More information about the livecd mailing list