* bootstrap: Add default $auxdir value. ltmain.m4sh

is prerequisite to ltmain.sh.  Improve warning message.

diff --git a/ChangeLog b/ChangeLog
index 032cd42f24818bb13bd75d363ed0c1ef4a2909fa..83146d7ec55e6ca4f324c1081d6cb0d757f21180 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-23  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * bootstrap: Add default $auxdir value.  ltmain.m4sh
+       is prerequisite to ltmain.sh.  Improve warning message.
+
 2005-08-18  Gary V. Vaughan  <gary@gnu.org>
            Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 

diff --git a/bootstrap b/bootstrap
index 1a9308a3bfa78b31dfcbb891ca68be2f760423d6..90f68061e89b188533016738147eab86b0f3a43d 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -38,6 +38,8 @@ test -f ./configure.ac || {
   exit 1
 }
 
+: ${auxdir=config}
+
 # Upgrade caveat:
 cat <<'EOF'
 WARNING: If bootstrapping with this script fails, it may be due to an
@@ -109,15 +111,16 @@ rm -f Makefile libltdl/Makefile libtool vcl.tmp
 # This file is misgenerated earlier in bootstrap to satisfy automake 1.9.1
 # and earlier, but has a new enough timestamp to not be updated.  Force it
 # to be regenerated at make-time with proper substitutions in place:
-touch config/ltmain.in
+touch $auxdir/ltmain.m4sh
 
 # Commit script caveat:
-cat <<'EOF'
-WARNING: You might want to regenerate `commit' and `config/mailnotify'
-WARNING: after you have run `configure' to discover the real whereabouts
-WARNING: of `sed', `grep' etc. like this:
+cat <<EOF
+WARNING: You might want to regenerate \`commit' and \`$auxdir/mailnotify'
+WARNING: after you have run \`configure' to discover the real whereabouts
+WARNING: of \`sed', \`grep' etc. like this:
 WARNING:
-WARNING:      rm -f config/mailnotify; make -f Makefile.maint commit
+WARNING:      rm -f commit $auxdir/mailnotify
+WARNING:      make -f Makefile.maint commit $auxdir/mailnotify
 EOF
 
 exit 0