r1331 - trunk/packages/glibc

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Sat Dec 31 06:39:03 PST 2005


Author: alexander
Date: 2005-12-31 07:39:02 -0700 (Sat, 31 Dec 2005)
New Revision: 1331

Modified:
   trunk/packages/glibc/Makefile
Log:
Removed the libidn add-on from Chapter 5 Glibc


Modified: trunk/packages/glibc/Makefile
===================================================================
--- trunk/packages/glibc/Makefile	2005-12-31 10:35:44 UTC (rev 1330)
+++ trunk/packages/glibc/Makefile	2005-12-31 14:39:02 UTC (rev 1331)
@@ -74,7 +74,6 @@
 	cp $(SRC)/{$(FILE),$(FILE2)} $(LFSSRC)/
 
 compile-stage1:
-	cd ../$(DIR) ; unpack ../$(FILE2)
 	../$(DIR)/configure --prefix=$(WD) --disable-profile \
 	 --enable-add-ons --enable-kernel=2.6.0 --with-binutils=$(WD)/bin \
 	 --without-gd --with-headers=$(WD)/include --without-selinux
@@ -133,7 +132,7 @@
 	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 ifndef CROSS
-stage2: $(FILE)
+stage2: $(FILE) $(FILE2)
 	$(sep_dir_build)
 	touch $@
 
@@ -149,7 +148,7 @@
 	 --enable-add-ons --enable-kernel=2.6.0 --libexecdir=/usr/lib/glibc
 	PARALLELMFLAGS="$(PM)" make
 	touch /etc/ld.so.conf
-	PARALLELMFLAGS="$(PM)" make install
+	PARALLELMFLAGS="$(PM)" make install_root=/ install
 	PARALLELMFLAGS="$(PM)" make localedata/install-locales
 	cp $(ROOT)/etc/nsswitch.conf /etc
 	cp --remove-destination /usr/share/zoneinfo/$(timezone) /etc/localtime
@@ -183,7 +182,7 @@
     	 --libexecdir=/usr/lib64/glibc --libdir=/usr/lib64
 	PARALLELMFLAGS="$(PM)" make
 	touch /etc/ld.so.conf
-	make install
+	make install_root=/ install
 	PARALLELMFLAGS="$(PM)" make localedata/install-locales
 	cp $(ROOT)/etc/nsswitch.conf /etc
 	cp --remove-destination /usr/share/zoneinfo/$(timezone) /etc/localtime
@@ -204,7 +203,7 @@
     	 --libexecdir=/usr/lib/glibc --host=$(LFS_TARGET32)
 	PARALLELMFLAGS="$(PM)" make
 	touch /etc/ld.so.conf
-	make install
+	make install_root=/ install
 
 clean:
 	-rm -rf $(DIR)




More information about the livecd mailing list