r1440 - trunk

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Sat Mar 4 16:27:31 PST 2006


Author: jhuntwork
Date: 2006-03-04 17:27:30 -0700 (Sat, 04 Mar 2006)
New Revision: 1440

Modified:
   trunk/Makefile
Log:
Some fixes for CROSS builds - Add texinfo to stage1 builds

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2006-03-05 00:25:44 UTC (rev 1439)
+++ trunk/Makefile	2006-03-05 00:27:30 UTC (rev 1440)
@@ -33,8 +33,8 @@
 export timezone ?= GMT
 export pagesize ?= letter
 export ROOT ?= /lfs-livecd
-export PM ?= -j3
-export HTTP ?= http://ftp.lfs-matrix.net/pub/lfs/conglomeration
+#export PM ?= -j3
+export HTTP ?= http://ftp.linuxfromscratch.org/pub/lfs/conglomeration
 export HTTPBLFS ?= http://ftp.lfs-matrix.net/pub/blfs/conglomeration
 
 # Directory variables
@@ -82,8 +82,8 @@
 
 export chbash-pre-bash := SHELL=$(WD)/bin/bash
 export chbash-post-bash := SHELL=/bin/bash
-export WHICH= $(WD)/bin/which
-export WGET?= wget
+export WHICH ?= $(WD)/bin/which
+export WGET ?= wget
 
 export BRW= ""
 export RED= ""
@@ -226,10 +226,10 @@
 	lfs-wget-scpt lfs-strip
 	@cp /etc/resolv.conf $(WD)/etc
 else
-tools: lfs-binutils-scpt lfs-gcc-scpt lfs-zlib-scpt lfs-gawk-scpt lfs-coreutils-scpt \
+tools: lfs-binutils-scpt lfs-gcc-scpt lfs-gawk-scpt lfs-coreutils-scpt \
 	lfs-bzip2-scpt lfs-gzip-scpt lfs-diffutils-scpt lfs-findutils-scpt lfs-make-scpt \
 	lfs-grep-scpt lfs-sed-scpt lfs-gettext-scpt lfs-ncurses-scpt lfs-patch-scpt \
-	lfs-tar-scpt lfs-bash-scpt lfs-util-linux-scpt lfs-wget-scpt
+	lfs-tar-scpt lfs-bash-scpt lfs-texinfo-scpt lfs-util-linux-scpt lfs-wget-scpt
 	@cp /etc/resolv.conf $(WD)/etc
 endif
 




More information about the livecd mailing list