r368 - in x86/branches/utf8: initramfs packages/LFS-BOOK packages/LVM2 packages/Xorg packages/atk packages/autoconf packages/automake packages/bash packages/bison packages/blfs-bootscripts packages/bzip2 packages/cdrtools packages/coreutils packages/cpio packages/curl packages/cvs packages/device-mapper packages/dhcpcd packages/dialog packages/diffutils packages/distcc packages/docbook-xml packages/docbook-xsl packages/e2fsprogs packages/eject packages/expat packages/file packages/findutils packages/firefox packages/flex packages/fontconfig packages/fonts-dejavu packages/freefont packages/freetype packages/gawk packages/gettext packages/glib2 packages/glibc packages/gpm packages/grep packages/groff packages/grub packages/gtk+2 packages/gzip packages/hotplug packages/html_tidy packages/iana-etc packages/imlib2 packages/inetutils packages/inputattach packages/ion packages/iproute2 packages/irssi packages/isoinfo packages/joe packages/kbd packages/klibc packages/less packages/lfs-bootscripts packages/libIDL packages/libaal packages/libjpeg packages/libpng packages/libtiff packages/libtool packages/libungif packages/libxml2 packages/libxslt packages/links packages/linux packages/linux-libc-headers packages/lua packages/lynx packages/m4 packages/make packages/man packages/man-pages packages/mktemp packages/module-init-tools packages/msmtp packages/mutt packages/nALFS packages/nano packages/ncftp packages/ncurses packages/nfs-utils packages/openssh packages/openssl packages/pango packages/patch packages/pciutils packages/perl packages/pkgconfig packages/popt packages/portmap packages/ppp packages/procps packages/psmisc packages/raidtools packages/readline packages/redhat-patches packages/reiser4progs packages/reiserfsprogs packages/rp-pppoe packages/samba packages/screen packages/sed packages/shadow packages/sharutils packages/slang packages/slrn packages/squashfs packages/startup-notification packages/subversion packages/sysklogd packages/syslinux packages/sysvinit packages/tar packages/tcpwrappers packages/texinfo packages/thunderbird packages/traceroute packages/udev packages/unionfs packages/unzip packages/util-linux packages/vim packages/xchat packages/xfce packages/xfsprogs packages/zip packages/zlib

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Sun Jul 17 23:17:41 PDT 2005


Author: jhuntwork
Date: 2005-07-18 00:17:33 -0600 (Mon, 18 Jul 2005)
New Revision: 368

Modified:
   x86/branches/utf8/initramfs/Makefile
   x86/branches/utf8/packages/LFS-BOOK/Makefile
   x86/branches/utf8/packages/LVM2/Makefile
   x86/branches/utf8/packages/Xorg/Makefile
   x86/branches/utf8/packages/atk/Makefile
   x86/branches/utf8/packages/autoconf/Makefile
   x86/branches/utf8/packages/automake/Makefile
   x86/branches/utf8/packages/bash/Makefile
   x86/branches/utf8/packages/bison/Makefile
   x86/branches/utf8/packages/blfs-bootscripts/Makefile
   x86/branches/utf8/packages/bzip2/Makefile
   x86/branches/utf8/packages/cdrtools/Makefile
   x86/branches/utf8/packages/coreutils/Makefile
   x86/branches/utf8/packages/cpio/Makefile
   x86/branches/utf8/packages/curl/Makefile
   x86/branches/utf8/packages/cvs/Makefile
   x86/branches/utf8/packages/device-mapper/Makefile
   x86/branches/utf8/packages/dhcpcd/Makefile
   x86/branches/utf8/packages/dialog/Makefile
   x86/branches/utf8/packages/diffutils/Makefile
   x86/branches/utf8/packages/distcc/Makefile
   x86/branches/utf8/packages/docbook-xml/Makefile
   x86/branches/utf8/packages/docbook-xsl/Makefile
   x86/branches/utf8/packages/e2fsprogs/Makefile
   x86/branches/utf8/packages/eject/Makefile
   x86/branches/utf8/packages/expat/Makefile
   x86/branches/utf8/packages/file/Makefile
   x86/branches/utf8/packages/findutils/Makefile
   x86/branches/utf8/packages/firefox/Makefile
   x86/branches/utf8/packages/flex/Makefile
   x86/branches/utf8/packages/fontconfig/Makefile
   x86/branches/utf8/packages/fonts-dejavu/Makefile
   x86/branches/utf8/packages/freefont/Makefile
   x86/branches/utf8/packages/freetype/Makefile
   x86/branches/utf8/packages/gawk/Makefile
   x86/branches/utf8/packages/gettext/Makefile
   x86/branches/utf8/packages/glib2/Makefile
   x86/branches/utf8/packages/glibc/Makefile
   x86/branches/utf8/packages/gpm/Makefile
   x86/branches/utf8/packages/grep/Makefile
   x86/branches/utf8/packages/groff/Makefile
   x86/branches/utf8/packages/grub/Makefile
   x86/branches/utf8/packages/gtk+2/Makefile
   x86/branches/utf8/packages/gzip/Makefile
   x86/branches/utf8/packages/hotplug/Makefile
   x86/branches/utf8/packages/html_tidy/Makefile
   x86/branches/utf8/packages/iana-etc/Makefile
   x86/branches/utf8/packages/imlib2/Makefile
   x86/branches/utf8/packages/inetutils/Makefile
   x86/branches/utf8/packages/inputattach/Makefile
   x86/branches/utf8/packages/ion/Makefile
   x86/branches/utf8/packages/iproute2/Makefile
   x86/branches/utf8/packages/irssi/Makefile
   x86/branches/utf8/packages/isoinfo/Makefile
   x86/branches/utf8/packages/joe/Makefile
   x86/branches/utf8/packages/kbd/Makefile
   x86/branches/utf8/packages/klibc/Makefile
   x86/branches/utf8/packages/less/Makefile
   x86/branches/utf8/packages/lfs-bootscripts/Makefile
   x86/branches/utf8/packages/libIDL/Makefile
   x86/branches/utf8/packages/libaal/Makefile
   x86/branches/utf8/packages/libjpeg/Makefile
   x86/branches/utf8/packages/libpng/Makefile
   x86/branches/utf8/packages/libtiff/Makefile
   x86/branches/utf8/packages/libtool/Makefile
   x86/branches/utf8/packages/libungif/Makefile
   x86/branches/utf8/packages/libxml2/Makefile
   x86/branches/utf8/packages/libxslt/Makefile
   x86/branches/utf8/packages/links/Makefile
   x86/branches/utf8/packages/linux-libc-headers/Makefile
   x86/branches/utf8/packages/linux/Makefile
   x86/branches/utf8/packages/lua/Makefile
   x86/branches/utf8/packages/lynx/Makefile
   x86/branches/utf8/packages/m4/Makefile
   x86/branches/utf8/packages/make/Makefile
   x86/branches/utf8/packages/man-pages/Makefile
   x86/branches/utf8/packages/man/Makefile
   x86/branches/utf8/packages/mktemp/Makefile
   x86/branches/utf8/packages/module-init-tools/Makefile
   x86/branches/utf8/packages/msmtp/Makefile
   x86/branches/utf8/packages/mutt/Makefile
   x86/branches/utf8/packages/nALFS/Makefile
   x86/branches/utf8/packages/nano/Makefile
   x86/branches/utf8/packages/ncftp/Makefile
   x86/branches/utf8/packages/ncurses/Makefile
   x86/branches/utf8/packages/nfs-utils/Makefile
   x86/branches/utf8/packages/openssh/Makefile
   x86/branches/utf8/packages/openssl/Makefile
   x86/branches/utf8/packages/pango/Makefile
   x86/branches/utf8/packages/patch/Makefile
   x86/branches/utf8/packages/pciutils/Makefile
   x86/branches/utf8/packages/perl/Makefile
   x86/branches/utf8/packages/pkgconfig/Makefile
   x86/branches/utf8/packages/popt/Makefile
   x86/branches/utf8/packages/portmap/Makefile
   x86/branches/utf8/packages/ppp/Makefile
   x86/branches/utf8/packages/procps/Makefile
   x86/branches/utf8/packages/psmisc/Makefile
   x86/branches/utf8/packages/raidtools/Makefile
   x86/branches/utf8/packages/readline/Makefile
   x86/branches/utf8/packages/redhat-patches/Makefile
   x86/branches/utf8/packages/reiser4progs/Makefile
   x86/branches/utf8/packages/reiserfsprogs/Makefile
   x86/branches/utf8/packages/rp-pppoe/Makefile
   x86/branches/utf8/packages/samba/Makefile
   x86/branches/utf8/packages/screen/Makefile
   x86/branches/utf8/packages/sed/Makefile
   x86/branches/utf8/packages/shadow/Makefile
   x86/branches/utf8/packages/sharutils/Makefile
   x86/branches/utf8/packages/slang/Makefile
   x86/branches/utf8/packages/slrn/Makefile
   x86/branches/utf8/packages/squashfs/Makefile
   x86/branches/utf8/packages/startup-notification/Makefile
   x86/branches/utf8/packages/subversion/Makefile
   x86/branches/utf8/packages/sysklogd/Makefile
   x86/branches/utf8/packages/syslinux/Makefile
   x86/branches/utf8/packages/sysvinit/Makefile
   x86/branches/utf8/packages/tar/Makefile
   x86/branches/utf8/packages/tcpwrappers/Makefile
   x86/branches/utf8/packages/texinfo/Makefile
   x86/branches/utf8/packages/thunderbird/Makefile
   x86/branches/utf8/packages/traceroute/Makefile
   x86/branches/utf8/packages/udev/Makefile
   x86/branches/utf8/packages/unionfs/Makefile
   x86/branches/utf8/packages/unzip/Makefile
   x86/branches/utf8/packages/util-linux/Makefile
   x86/branches/utf8/packages/vim/Makefile
   x86/branches/utf8/packages/xchat/Makefile
   x86/branches/utf8/packages/xfce/Makefile
   x86/branches/utf8/packages/xfsprogs/Makefile
   x86/branches/utf8/packages/zip/Makefile
   x86/branches/utf8/packages/zlib/Makefile
Log:
Fully changed the names of the environment variables

Modified: x86/branches/utf8/initramfs/Makefile
===================================================================
--- x86/branches/utf8/initramfs/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/initramfs/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -38,7 +38,7 @@
 	rm -rf temp
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-initramfs $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-initramfs $(chbash-post-bash)'
 
 clean:
 	-rm -rf temp

Modified: x86/branches/utf8/packages/LFS-BOOK/Makefile
===================================================================
--- x86/branches/utf8/packages/LFS-BOOK/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/LFS-BOOK/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -13,7 +13,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/LVM2/Makefile
===================================================================
--- x86/branches/utf8/packages/LVM2/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/LVM2/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/Xorg/Makefile
===================================================================
--- x86/branches/utf8/packages/Xorg/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/Xorg/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -16,7 +16,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/atk/Makefile
===================================================================
--- x86/branches/utf8/packages/atk/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/atk/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/autoconf/Makefile
===================================================================
--- x86/branches/utf8/packages/autoconf/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/autoconf/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -13,7 +13,7 @@
 .PHONY:  clean stage2 chroot
 
 chroot:
-	@chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-$(NM) $(chbash1)'
+	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/automake/Makefile
===================================================================
--- x86/branches/utf8/packages/automake/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/automake/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -13,7 +13,7 @@
 .PHONY:  clean stage2 chroot
 
 chroot:
-	@chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-$(NM) $(chbash1)'
+	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/bash/Makefile
===================================================================
--- x86/branches/utf8/packages/bash/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/bash/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -38,7 +38,7 @@
 	@make clean
 
 chroot:
-	@chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-$(NM) $(chbash1)'
+	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/bison/Makefile
===================================================================
--- x86/branches/utf8/packages/bison/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/bison/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -22,7 +22,7 @@
 	@make clean
 
 chroot:
-	@chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-$(NM) $(chbash1)'
+	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/blfs-bootscripts/Makefile
===================================================================
--- x86/branches/utf8/packages/blfs-bootscripts/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/blfs-bootscripts/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -13,7 +13,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/bzip2/Makefile
===================================================================
--- x86/branches/utf8/packages/bzip2/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/bzip2/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -22,7 +22,7 @@
 	@make clean
 
 chroot:
-	@chroot "$(MP)" $(chenv2) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-post-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/cdrtools/Makefile
===================================================================
--- x86/branches/utf8/packages/cdrtools/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/cdrtools/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/coreutils/Makefile
===================================================================
--- x86/branches/utf8/packages/coreutils/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/coreutils/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -91,7 +91,7 @@
 	@make clean
 
 chroot:
-	@chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-$(NM) $(chbash1)'
+	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/cpio/Makefile
===================================================================
--- x86/branches/utf8/packages/cpio/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/cpio/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/curl/Makefile
===================================================================
--- x86/branches/utf8/packages/curl/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/curl/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/cvs/Makefile
===================================================================
--- x86/branches/utf8/packages/cvs/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/cvs/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -14,7 +14,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/device-mapper/Makefile
===================================================================
--- x86/branches/utf8/packages/device-mapper/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/device-mapper/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/dhcpcd/Makefile
===================================================================
--- x86/branches/utf8/packages/dhcpcd/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/dhcpcd/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -14,7 +14,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/dialog/Makefile
===================================================================
--- x86/branches/utf8/packages/dialog/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/dialog/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/diffutils/Makefile
===================================================================
--- x86/branches/utf8/packages/diffutils/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/diffutils/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -27,7 +27,7 @@
 	@make clean
 
 chroot:
-	@chroot "$(MP)" $(chenv2) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-post-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/distcc/Makefile
===================================================================
--- x86/branches/utf8/packages/distcc/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/distcc/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean stage2 chroot
 
 chroot:
-	@chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-$(NM) $(chbash1)'
+	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/docbook-xml/Makefile
===================================================================
--- x86/branches/utf8/packages/docbook-xml/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/docbook-xml/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -14,7 +14,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/docbook-xsl/Makefile
===================================================================
--- x86/branches/utf8/packages/docbook-xsl/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/docbook-xsl/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -14,7 +14,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/e2fsprogs/Makefile
===================================================================
--- x86/branches/utf8/packages/e2fsprogs/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/e2fsprogs/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -13,7 +13,7 @@
 .PHONY:  clean stage2 chroot
 
 chroot:
-	@chroot "$(MP)" $(chenv2) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-post-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/eject/Makefile
===================================================================
--- x86/branches/utf8/packages/eject/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/eject/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: stage1 clean stage2 chroot
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/expat/Makefile
===================================================================
--- x86/branches/utf8/packages/expat/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/expat/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -14,7 +14,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/file/Makefile
===================================================================
--- x86/branches/utf8/packages/file/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/file/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY:  clean stage2 chroot
 
 chroot:
-	@chroot "$(MP)" $(chenv2) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-post-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/findutils/Makefile
===================================================================
--- x86/branches/utf8/packages/findutils/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/findutils/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -22,7 +22,7 @@
 	@make clean
 
 chroot:
-	@chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-$(NM) $(chbash1)'
+	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/firefox/Makefile
===================================================================
--- x86/branches/utf8/packages/firefox/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/firefox/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/flex/Makefile
===================================================================
--- x86/branches/utf8/packages/flex/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/flex/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -27,7 +27,7 @@
 	@make clean
 
 chroot:
-	@chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-$(NM) $(chbash1)'
+	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/fontconfig/Makefile
===================================================================
--- x86/branches/utf8/packages/fontconfig/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/fontconfig/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -13,7 +13,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/fonts-dejavu/Makefile
===================================================================
--- x86/branches/utf8/packages/fonts-dejavu/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/fonts-dejavu/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -13,7 +13,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-fonts-dejavu $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-fonts-dejavu $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/freefont/Makefile
===================================================================
--- x86/branches/utf8/packages/freefont/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/freefont/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -13,7 +13,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/freetype/Makefile
===================================================================
--- x86/branches/utf8/packages/freetype/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/freetype/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -14,7 +14,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/gawk/Makefile
===================================================================
--- x86/branches/utf8/packages/gawk/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/gawk/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -65,7 +65,7 @@
 	@make clean
 
 chroot:
-	@chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-$(NM) $(chbash1)'
+	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/gettext/Makefile
===================================================================
--- x86/branches/utf8/packages/gettext/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/gettext/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -22,7 +22,7 @@
 	@make clean
 
 chroot:
-	@chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-$(NM) $(chbash1)'
+	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 stage2:
 	echo ""

Modified: x86/branches/utf8/packages/glib2/Makefile
===================================================================
--- x86/branches/utf8/packages/glib2/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/glib2/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM)2 $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM)2 $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/glibc/Makefile
===================================================================
--- x86/branches/utf8/packages/glibc/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/glibc/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -33,7 +33,7 @@
 	@make clean
 
 chroot:
-	@chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-glibc $(chbash1)'
+	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-glibc $(chbash-pre-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/gpm/Makefile
===================================================================
--- x86/branches/utf8/packages/gpm/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/gpm/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -19,7 +19,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/grep/Makefile
===================================================================
--- x86/branches/utf8/packages/grep/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/grep/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -70,7 +70,7 @@
 	@make clean
 
 chroot:
-	@chroot "$(MP)" $(chenv2) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-post-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/groff/Makefile
===================================================================
--- x86/branches/utf8/packages/groff/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/groff/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -14,7 +14,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-$(NM) $(chbash1)'
+	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/grub/Makefile
===================================================================
--- x86/branches/utf8/packages/grub/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/grub/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -13,7 +13,7 @@
 .PHONY:  clean stage2 chroot
 
 chroot:
-	@chroot "$(MP)" $(chenv2) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-post-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/gtk+2/Makefile
===================================================================
--- x86/branches/utf8/packages/gtk+2/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/gtk+2/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-gtk2 $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-gtk2 $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/gzip/Makefile
===================================================================
--- x86/branches/utf8/packages/gzip/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/gzip/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -24,7 +24,7 @@
 	@make clean
 
 chroot:
-	@chroot "$(MP)" $(chenv2) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-post-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/hotplug/Makefile
===================================================================
--- x86/branches/utf8/packages/hotplug/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/hotplug/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -14,7 +14,7 @@
 .PHONY:  clean stage2 chroot
 
 chroot:
-	@chroot "$(MP)" $(chenv2) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-post-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/html_tidy/Makefile
===================================================================
--- x86/branches/utf8/packages/html_tidy/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/html_tidy/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -16,7 +16,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-html_$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-html_$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/iana-etc/Makefile
===================================================================
--- x86/branches/utf8/packages/iana-etc/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/iana-etc/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: chroot stage2 clean
 
 chroot:
-	@chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-$(NM) $(chbash1)'
+	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/imlib2/Makefile
===================================================================
--- x86/branches/utf8/packages/imlib2/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/imlib2/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/inetutils/Makefile
===================================================================
--- x86/branches/utf8/packages/inetutils/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/inetutils/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -16,7 +16,7 @@
 .PHONY: chroot stage2 clean
 
 chroot:
-	@chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-$(NM) $(chbash1)'
+	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/inputattach/Makefile
===================================================================
--- x86/branches/utf8/packages/inputattach/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/inputattach/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -8,7 +8,7 @@
 .PHONY: stage2 chroot
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/ion/Makefile
===================================================================
--- x86/branches/utf8/packages/ion/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/ion/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/iproute2/Makefile
===================================================================
--- x86/branches/utf8/packages/iproute2/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/iproute2/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -15,7 +15,7 @@
 .PHONY: chroot stage2 clean
 
 chroot:
-	@chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-$(NM) $(chbash1)'
+	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/irssi/Makefile
===================================================================
--- x86/branches/utf8/packages/irssi/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/irssi/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/isoinfo/Makefile
===================================================================
--- x86/branches/utf8/packages/isoinfo/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/isoinfo/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot klibc-isoinfo
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 klibc-isoinfo:
 	@echo ""

Modified: x86/branches/utf8/packages/joe/Makefile
===================================================================
--- x86/branches/utf8/packages/joe/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/joe/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/kbd/Makefile
===================================================================
--- x86/branches/utf8/packages/kbd/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/kbd/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -16,7 +16,7 @@
 .PHONY:  clean stage2 chroot
 
 chroot:
-	@chroot "$(MP)" $(chenv2) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-post-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/klibc/Makefile
===================================================================
--- x86/branches/utf8/packages/klibc/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/klibc/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -13,7 +13,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/less/Makefile
===================================================================
--- x86/branches/utf8/packages/less/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/less/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-$(NM) $(chbash1)'
+	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/lfs-bootscripts/Makefile
===================================================================
--- x86/branches/utf8/packages/lfs-bootscripts/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/lfs-bootscripts/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -13,7 +13,7 @@
 .PHONY:  clean stage2 chroot
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/libIDL/Makefile
===================================================================
--- x86/branches/utf8/packages/libIDL/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/libIDL/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/libaal/Makefile
===================================================================
--- x86/branches/utf8/packages/libaal/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/libaal/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/libjpeg/Makefile
===================================================================
--- x86/branches/utf8/packages/libjpeg/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/libjpeg/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -13,7 +13,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/libpng/Makefile
===================================================================
--- x86/branches/utf8/packages/libpng/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/libpng/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -16,7 +16,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/libtiff/Makefile
===================================================================
--- x86/branches/utf8/packages/libtiff/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/libtiff/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -13,7 +13,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-lib$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-lib$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/libtool/Makefile
===================================================================
--- x86/branches/utf8/packages/libtool/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/libtool/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -13,7 +13,7 @@
 .PHONY:  clean stage2 chroot
 
 chroot:
-	@chroot "$(MP)" $(chenv2) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-post-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/libungif/Makefile
===================================================================
--- x86/branches/utf8/packages/libungif/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/libungif/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/libxml2/Makefile
===================================================================
--- x86/branches/utf8/packages/libxml2/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/libxml2/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -14,7 +14,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/libxslt/Makefile
===================================================================
--- x86/branches/utf8/packages/libxslt/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/libxslt/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -14,7 +14,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/links/Makefile
===================================================================
--- x86/branches/utf8/packages/links/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/links/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -13,7 +13,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/linux/Makefile
===================================================================
--- x86/branches/utf8/packages/linux/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/linux/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -15,7 +15,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/linux-libc-headers/Makefile
===================================================================
--- x86/branches/utf8/packages/linux-libc-headers/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/linux-libc-headers/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -22,7 +22,7 @@
 	@make clean
 
 chroot:
-	@chroot "$(MP)" $(chenv1) 'cd $(MKTREE) && make ch-linux-libc-headers $(chbash1)'
+	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(MKTREE) && make ch-linux-libc-headers $(chbash-pre-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/lua/Makefile
===================================================================
--- x86/branches/utf8/packages/lua/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/lua/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/lynx/Makefile
===================================================================
--- x86/branches/utf8/packages/lynx/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/lynx/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -14,7 +14,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/m4/Makefile
===================================================================
--- x86/branches/utf8/packages/m4/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/m4/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -22,7 +22,7 @@
 	@make clean
 
 chroot:
-	@chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-$(NM) $(chbash1)'
+	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/make/Makefile
===================================================================
--- x86/branches/utf8/packages/make/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/make/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -22,7 +22,7 @@
 	@make clean
 
 chroot:
-	@chroot "$(MP)" $(chenv2) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-post-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/man/Makefile
===================================================================
--- x86/branches/utf8/packages/man/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/man/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -13,7 +13,7 @@
 .PHONY:  clean stage2 chroot
 
 chroot:
-	@chroot "$(MP)" $(chenv2) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-post-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/man-pages/Makefile
===================================================================
--- x86/branches/utf8/packages/man-pages/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/man-pages/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: chroot stage2 clean
 
 chroot:
-	@chroot "$(MP)" $(chenv1) 'cd $(MKTREE) && make ch-man-pages $(chbash1)'
+	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(MKTREE) && make ch-man-pages $(chbash-pre-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/mktemp/Makefile
===================================================================
--- x86/branches/utf8/packages/mktemp/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/mktemp/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -14,7 +14,7 @@
 .PHONY:  clean stage2 chroot
 
 chroot:
-	@chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-$(NM) $(chbash1)'
+	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/module-init-tools/Makefile
===================================================================
--- x86/branches/utf8/packages/module-init-tools/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/module-init-tools/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -13,7 +13,7 @@
 .PHONY:  clean stage2 chroot
 
 chroot:
-	@chroot "$(MP)" $(chenv2) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-post-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/msmtp/Makefile
===================================================================
--- x86/branches/utf8/packages/msmtp/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/msmtp/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -11,7 +11,7 @@
 
 .PHONY: clean stage2 chroot
 
-	@chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-$(NM) $(chbash1)'
+	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 # This target is for building the package once we're already inside
 # the chroot environment.

Modified: x86/branches/utf8/packages/mutt/Makefile
===================================================================
--- x86/branches/utf8/packages/mutt/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/mutt/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -14,7 +14,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/nALFS/Makefile
===================================================================
--- x86/branches/utf8/packages/nALFS/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/nALFS/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/nano/Makefile
===================================================================
--- x86/branches/utf8/packages/nano/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/nano/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -13,7 +13,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/ncftp/Makefile
===================================================================
--- x86/branches/utf8/packages/ncftp/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/ncftp/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/ncurses/Makefile
===================================================================
--- x86/branches/utf8/packages/ncurses/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/ncurses/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -33,7 +33,7 @@
 	@make clean
 
 chroot:
-	@chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-$(NM) $(chbash1)'
+	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/nfs-utils/Makefile
===================================================================
--- x86/branches/utf8/packages/nfs-utils/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/nfs-utils/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/openssh/Makefile
===================================================================
--- x86/branches/utf8/packages/openssh/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/openssh/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/openssl/Makefile
===================================================================
--- x86/branches/utf8/packages/openssl/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/openssl/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -14,7 +14,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/pango/Makefile
===================================================================
--- x86/branches/utf8/packages/pango/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/pango/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/patch/Makefile
===================================================================
--- x86/branches/utf8/packages/patch/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/patch/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -22,7 +22,7 @@
 	@make clean
 
 chroot:
-	@chroot "$(MP)" $(chenv2) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-post-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/pciutils/Makefile
===================================================================
--- x86/branches/utf8/packages/pciutils/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/pciutils/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/perl/Makefile
===================================================================
--- x86/branches/utf8/packages/perl/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/perl/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -29,7 +29,7 @@
 	@make clean
 
 chroot:
-	@chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-$(NM) $(chbash1)'
+	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/pkgconfig/Makefile
===================================================================
--- x86/branches/utf8/packages/pkgconfig/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/pkgconfig/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/popt/Makefile
===================================================================
--- x86/branches/utf8/packages/popt/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/popt/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -14,7 +14,7 @@
 .PHONY: clean stage2 chroot
 
 chroot:
-	@chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-$(NM) $(chbash1)'
+	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/portmap/Makefile
===================================================================
--- x86/branches/utf8/packages/portmap/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/portmap/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -16,7 +16,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/ppp/Makefile
===================================================================
--- x86/branches/utf8/packages/ppp/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/ppp/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/procps/Makefile
===================================================================
--- x86/branches/utf8/packages/procps/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/procps/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY:  clean stage2 chroot
 
 chroot:
-	@chroot "$(MP)" $(chenv2) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-post-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/psmisc/Makefile
===================================================================
--- x86/branches/utf8/packages/psmisc/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/psmisc/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -14,7 +14,7 @@
 .PHONY:  clean stage2 chroot
 
 chroot:
-	@chroot "$(MP)" $(chenv2) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-post-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/raidtools/Makefile
===================================================================
--- x86/branches/utf8/packages/raidtools/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/raidtools/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -13,7 +13,7 @@
 .PHONY: clean stage2 chroot
 
 chroot:
-	@chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-$(NM) $(chbash1)'
+	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/readline/Makefile
===================================================================
--- x86/branches/utf8/packages/readline/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/readline/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -19,7 +19,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-$(NM) $(chbash1)'
+	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/redhat-patches/Makefile
===================================================================
--- x86/branches/utf8/packages/redhat-patches/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/redhat-patches/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -14,7 +14,7 @@
 .PHONY: chroot stage2 clean
 
 chroot:
-	@chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-$(NM) $(chbash1)'
+	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 # This target is for building the package once we're already inside
 # the chroot environment.

Modified: x86/branches/utf8/packages/reiser4progs/Makefile
===================================================================
--- x86/branches/utf8/packages/reiser4progs/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/reiser4progs/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/reiserfsprogs/Makefile
===================================================================
--- x86/branches/utf8/packages/reiserfsprogs/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/reiserfsprogs/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/rp-pppoe/Makefile
===================================================================
--- x86/branches/utf8/packages/rp-pppoe/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/rp-pppoe/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -14,7 +14,7 @@
 .PHONY:  clean stage2 chroot
 
 chroot:
-	@chroot "$(MP)" $(chenv2) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-post-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/samba/Makefile
===================================================================
--- x86/branches/utf8/packages/samba/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/samba/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/screen/Makefile
===================================================================
--- x86/branches/utf8/packages/screen/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/screen/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/sed/Makefile
===================================================================
--- x86/branches/utf8/packages/sed/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/sed/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -22,7 +22,7 @@
 	@make clean
 
 chroot:
-	@chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-$(NM) $(chbash1)'
+	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 stage2:
 	@echo""

Modified: x86/branches/utf8/packages/shadow/Makefile
===================================================================
--- x86/branches/utf8/packages/shadow/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/shadow/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY:  clean stage2 chroot
 
 chroot:
-	@chroot "$(MP)" $(chenv2) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-post-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/sharutils/Makefile
===================================================================
--- x86/branches/utf8/packages/sharutils/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/sharutils/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-$(NM) $(chbash1)'
+	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/slang/Makefile
===================================================================
--- x86/branches/utf8/packages/slang/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/slang/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/slrn/Makefile
===================================================================
--- x86/branches/utf8/packages/slrn/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/slrn/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/squashfs/Makefile
===================================================================
--- x86/branches/utf8/packages/squashfs/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/squashfs/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -13,7 +13,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/startup-notification/Makefile
===================================================================
--- x86/branches/utf8/packages/startup-notification/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/startup-notification/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/subversion/Makefile
===================================================================
--- x86/branches/utf8/packages/subversion/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/subversion/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -14,7 +14,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/sysklogd/Makefile
===================================================================
--- x86/branches/utf8/packages/sysklogd/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/sysklogd/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -15,7 +15,7 @@
 .PHONY:  clean stage2 chroot
 
 chroot:
-	@chroot "$(MP)" $(chenv2) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-post-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/syslinux/Makefile
===================================================================
--- x86/branches/utf8/packages/syslinux/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/syslinux/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/sysvinit/Makefile
===================================================================
--- x86/branches/utf8/packages/sysvinit/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/sysvinit/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -14,7 +14,7 @@
 .PHONY:  clean stage2 chroot
 
 chroot:
-	@chroot "$(MP)" $(chenv2) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-post-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/tar/Makefile
===================================================================
--- x86/branches/utf8/packages/tar/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/tar/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -24,7 +24,7 @@
 	@make clean
 
 chroot:
-	@chroot "$(MP)" $(chenv2) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-post-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/tcpwrappers/Makefile
===================================================================
--- x86/branches/utf8/packages/tcpwrappers/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/tcpwrappers/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -16,7 +16,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/texinfo/Makefile
===================================================================
--- x86/branches/utf8/packages/texinfo/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/texinfo/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -23,7 +23,7 @@
 	@make clean
 
 chroot:
-	@chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-$(NM) $(chbash1)'
+	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/thunderbird/Makefile
===================================================================
--- x86/branches/utf8/packages/thunderbird/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/thunderbird/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/traceroute/Makefile
===================================================================
--- x86/branches/utf8/packages/traceroute/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/traceroute/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/udev/Makefile
===================================================================
--- x86/branches/utf8/packages/udev/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/udev/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -14,7 +14,7 @@
 .PHONY:  clean stage2 chroot
 
 chroot:
-	@chroot "$(MP)" $(chenv2) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-post-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/unionfs/Makefile
===================================================================
--- x86/branches/utf8/packages/unionfs/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/unionfs/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/unzip/Makefile
===================================================================
--- x86/branches/utf8/packages/unzip/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/unzip/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -20,7 +20,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/util-linux/Makefile
===================================================================
--- x86/branches/utf8/packages/util-linux/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/util-linux/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -26,7 +26,7 @@
 	@make clean
 
 chroot:
-	@chroot "$(MP)" $(chenv2) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-post-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/vim/Makefile
===================================================================
--- x86/branches/utf8/packages/vim/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/vim/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -16,10 +16,10 @@
 .PHONY: clean chroot stage2 stage3
 
 chroot:
-	@chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-$(NM) $(chbash1)'
+	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 chroot3:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-gvim $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-gvim $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/xchat/Makefile
===================================================================
--- x86/branches/utf8/packages/xchat/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/xchat/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/xfce/Makefile
===================================================================
--- x86/branches/utf8/packages/xfce/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/xfce/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/xfsprogs/Makefile
===================================================================
--- x86/branches/utf8/packages/xfsprogs/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/xfsprogs/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/zip/Makefile
===================================================================
--- x86/branches/utf8/packages/zip/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/zip/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -12,7 +12,7 @@
 .PHONY: clean chroot stage2
 
 chroot:
-	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2:
 	@echo ""

Modified: x86/branches/utf8/packages/zlib/Makefile
===================================================================
--- x86/branches/utf8/packages/zlib/Makefile	2005-07-18 06:15:05 UTC (rev 367)
+++ x86/branches/utf8/packages/zlib/Makefile	2005-07-18 06:17:33 UTC (rev 368)
@@ -13,7 +13,7 @@
 .PHONY: chroot stage2 clean
 
 chroot:
-	@chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-$(NM) $(chbash1)'
+	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 stage2:
 	@echo ""




More information about the livecd mailing list