r1432 - trunk/packages/binutils

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Fri Mar 3 16:10:57 PST 2006


Author: jhuntwork
Date: 2006-03-03 17:10:54 -0700 (Fri, 03 Mar 2006)
New Revision: 1432

Modified:
   trunk/packages/binutils/Makefile
Log:
Changed all instances of '/tools' to the build variable $(WD)

Modified: trunk/packages/binutils/Makefile
===================================================================
--- trunk/packages/binutils/Makefile	2006-03-04 00:06:52 UTC (rev 1431)
+++ trunk/packages/binutils/Makefile	2006-03-04 00:10:54 UTC (rev 1432)
@@ -63,16 +63,16 @@
 	make install
 	make -C ld clean
 	make -C ld LIB_PATH=$(WD)/lib
-	cp -v ld/ld-new /tools/bin
+	cp -v ld/ld-new $(WD)/bin
 
 adjust-toolchain:
-	mv -v /tools/bin/{ld,ld-old}
-	mv -v /tools/$$(gcc -dumpmachine)/bin/{ld,ld-old}
-	mv -v /tools/bin/{ld-new,ld}
-	ln -sv /tools/bin/ld /tools/$$(gcc -dumpmachine)/bin/ld
+	mv -v $(WD)/bin/{ld,ld-old}
+	mv -v $(WD)/$$(gcc -dumpmachine)/bin/{ld,ld-old}
+	mv -v $(WD)/bin/{ld-new,ld}
+	ln -sv $(WD)/bin/ld $(WD)/$$(gcc -dumpmachine)/bin/ld
 	SPECFILE=`dirname $$(gcc -print-libgcc-file-name)`/specs && \
 	gcc -dumpspecs > $$SPECFILE && \
-	sed 's@^/lib/ld-linux.so.2@/tools&@g' $$SPECFILE > tempspecfile && \
+	sed 's@^/lib/ld-linux.so.2@$(WD)&@g' $$SPECFILE > tempspecfile && \
 	mv -vf tempspecfile $$SPECFILE && \
 	unset SPECFILE
 	GCC_INCLUDEDIR=`dirname $$(gcc -print-libgcc-file-name)`/include && \
@@ -91,19 +91,19 @@
 	make install
 	make -C ld clean
 	make -C ld LIB_PATH=/usr/lib:/lib
-	cp -v ld/ld-new /tools/bin
+	cp -v ld/ld-new $(WD)/bin
 
 chroot-re-adjust-toolchain:
 	chroot "$(MP)" $(chenv-pre-bash) \
 	'cd $(ROOT) && make ch-re-adjust-toolchain $(chbash-pre-bash)'
 
 re-adjust-toolchain:
-	mv -v /tools/bin/{ld,ld-old}
-	mv -v /tools/$$(gcc -dumpmachine)/bin/{ld,ld-old}
-	mv -v /tools/bin/{ld-new,ld}
-	ln -sv /tools/bin/ld /tools/$$(gcc -dumpmachine)/bin/ld
+	mv -v $(WD)/bin/{ld,ld-old}
+	mv -v $(WD)/$$(gcc -dumpmachine)/bin/{ld,ld-old}
+	mv -v $(WD)/bin/{ld-new,ld}
+	ln -sv $(WD)/bin/ld $(WD)/$$(gcc -dumpmachine)/bin/ld
 	gcc -dumpspecs | \
-	perl -p -e 's@/tools/lib/ld-linux.so.2@/lib/ld-linux.so.2 at g;' \
+	perl -p -e 's@$(WD)/lib/ld-linux.so.2@/lib/ld-linux.so.2 at g;' \
 	    -e 's@\*startfile_prefix_spec:\n@$$_/usr/lib/ @g;' > \
 	    `dirname $$(gcc --print-libgcc-file-name)`/specs
 	touch $@




More information about the livecd mailing list