Merge pull request #66 from stikonas/aclocal

Rebuild aclocal.m4

sysa/binutils-2.14/binutils-2.14.sh

@@ -10,7 +10,6 @@ src_prepare() {
 
     # Rebuild aclocal.m4 files
     # aclocal.m4 in libiberty seems to be hand-written
-    # FIXME intl, needs gettext.m4
     for dir in binutils bfd gas gprof ld opcodes; do
 	cd $dir
 	rm aclocal.m4
@@ -18,6 +17,20 @@ src_prepare() {
 	cd ..
     done
 
+    # intl/aclocal.m4 consists of two parts.
+    # First is generated by aclocal and second is from
+    # gettext.m4 file that is handwritten
+    # Here we rebuild just the first part
+    cd intl
+    csplit -sf file -n 1 aclocal.m4 '/This file is derived from/'
+    rm file0
+    mv file1 gettext.m4
+    # Build with aclocal-1.4 instead of 1.3
+    sed -i 's/AM_PROG_INSTALL/AC_PROG_INSTALL/' configure.in
+    aclocal-1.4
+    cat gettext.m4 >> aclocal.m4
+    cd ..
+
     for dir in binutils bfd gas intl libiberty ld opcodes; do
 	cd $dir
 	rm config.in

sysa/run2.sh

@@ -14,4 +14,4 @@ build automake-1.5 stage2.sh
 
 echo "Bootstrapping completed."
 
-exec env - PATH=/after/bin bash -i
+exec env - PATH=/after/bin PS1="\w # " bash -i