* Makefile.am (TESTS_ENVIRONMENT): Export SHELL.

* bootstrap (SHELL): Set to $CONFIG_SHELL or /bin/sh.
Name `make' targets in portable fashion.  Work around `rm'
warnings.  Unconditionally create fake `libtoolize'.
Reported by Patrick Welche <prlw1@newn.cam.ac.uk>.

diff --git a/ChangeLog b/ChangeLog
index b2edaa683638837e04d8ec7191c55beae797e6d5..4eac428f05515c6a3ab10146829612e09b2c1387 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-09-05  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
+       * Makefile.am (TESTS_ENVIRONMENT): Export SHELL.
+       * bootstrap (SHELL): Set to $CONFIG_SHELL or /bin/sh.
+       Name `make' targets in portable fashion.  Work around `rm'
+       warnings.  Unconditionally create fake `libtoolize'.
+       Reported by Patrick Welche <prlw1@newn.cam.ac.uk>.
+
        * Makefile.am (doc/notes.txt): Use --no-headers instead of
        --plaintext for makeinfo.
        Reported by Peter O'Gorman <peter@pogma.com>.

diff --git a/Makefile.am b/Makefile.am
index 13ad258d4edcf7f73a98151c4875858b5b8c62c3..b51e71b874c731e634b4e50a5ee11404d47f6add 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -480,7 +480,8 @@ EXTRA_DIST     += $(TESTSUITE) $(TESTSUITE_AT) tests/package.m4
 TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" \
        CPP="$(CPP)" CPPFLAGS="$(CPPFLAGS)" LD="$(LD)" LDFLAGS="$(LDFLAGS)" \
        LIBS="$(LIBS)" LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \
-       OBJEXT="$(OBJEXT)" EXEEXT="$(EXEEXT)" CONFIG_SHELL="$(SHELL)" \
+       OBJEXT="$(OBJEXT)" EXEEXT="$(EXEEXT)" \
+       SHELL="$(SHELL)" CONFIG_SHELL="$(SHELL)" \
        CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" CXXCPP="$(CXXCPP)" \
        F77="$(F77)" FFLAGS="$(FFLAGS)" \
        FC="$(FC)" FCFLAGS="$(FCFLAGS)" \

diff --git a/bootstrap b/bootstrap
index 2f0db951752dbbffad9a8d5f80a85233118b7f20..d0be2a3920b6a1781e69e839859c34e0d2e12bfa 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -24,6 +24,8 @@
 # better features, and configure.ac documents oldest version of each
 # required for bootstrap (AC_PREREQ, and AM_INIT_AUTOMAKE).
 
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
 : ${AUTORECONF=autoreconf}
 : ${AUTOM4TE=autom4te}
 : ${MAKE=make}
@@ -63,7 +65,8 @@ WARNING: them with all m4 file as shipped with this distribution (except
 WARNING: `lt~obsolete.m4').  After that, retry this bootstrap.
 EOF
 
-rm -rf `find . -name '{arch}' -prune -o \( -name autom4te.cache -o -name libtool \) -print`
+find . -name '{arch}' -prune -o \( -name autom4te.cache -o -name libtool \) \
+       -depth -exec rm -rf \{\} \;
 
 # Delete stale files from previous libtool versions.
 rm -f acinclude.m4 libltdl/config.h
@@ -95,21 +98,21 @@ test -f Makefile \
 # configure, and ltversion.m4 to generate configure in the first place:
 rm -f $auxdir/ltmain.sh $m4dir/ltversion.m4
 
-$MAKE $auxdir/ltmain.sh $m4dir/ltversion.m4 ./doc/notes.txt \
+$MAKE ./$auxdir/ltmain.sh ./$m4dir/ltversion.m4 ./doc/notes.txt \
     ./libtoolize.in ./tests/defs.in ./tests/package.m4 \
     ./tests/testsuite ./libltdl/Makefile.am \
     srcdir=. top_srcdir=. PACKAGE="$2" VERSION="$3" \
     PACKAGE_BUGREPORT="bug-$2@gnu.org" M4SH="$AUTOM4TE --language=m4sh" \
     AUTOTEST="$AUTOM4TE --language=autotest" SED="$SED" MAKEINFO="$MAKEINFO"
 
-test -f clcommit.m4sh && $MAKE -f Makefile.maint commit \
+test -f clcommit.m4sh && $MAKE -f Makefile.maint ./commit \
     srcdir=. top_srcdir=. PACKAGE="$2" VERSION="$3" M4SH="$AUTOM4TE -l m4sh" \
     SED="$SED" GREP="$GREP" FGREP="$FGREP" EGREP="$EGREP" LN_S="$LN_S"
 
 rm -f Makefile
 
 # Make a dummy libtoolize script for autoreconf:
-test -f clcommit.m4sh && cat > $auxdir/libtoolize <<'EOF'
+cat > $auxdir/libtoolize <<'EOF'
 #! /bin/sh
 # This is a dummy file for bootstrapping CVS libtool.
 echo "$0: Bootstrap detected, no files installed." | sed 's,^.*/,,g'
@@ -152,7 +155,7 @@ WARNING: after you have run \`configure' to discover the real whereabouts
 WARNING: of \`sed', \`grep' etc. like this:
 WARNING:
 WARNING:      rm -f commit $auxdir/mailnotify
-WARNING:      make -f Makefile.maint commit $auxdir/mailnotify
+WARNING:      make -f Makefile.maint ./commit ./$auxdir/mailnotify
 EOF
 
 exit 0