[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: HEAD: bootstrap update
From: |
Ralf Wildenhues |
Subject: |
FYI: HEAD: bootstrap update |
Date: |
Tue, 23 Aug 2005 13:21:21 +0200 |
User-agent: |
Mutt/1.4.1i |
* Gary V. Vaughan wrote on Tue, Aug 23, 2005 at 12:39:31PM CEST:
> Ralf Wildenhues wrote:
> > * bootstrap: Fix missing replace config -> $auxdir. ltmain.m4sh
> > is prerequisite to ltmain.sh. Improve warning message.
>
> Ooo! Good catch. Please commit (HEAD and branch-2-0!)
Done. I added a default
: ${auxdir=config}
to branch-2-0 which you may remove with your backport, see below.
Cheers,
Ralf
* bootstrap: Add default $auxdir value. ltmain.m4sh
is prerequisite to ltmain.sh. Improve warning message.
Index: bootstrap
===================================================================
RCS file: /cvsroot/libtool/libtool/bootstrap,v
retrieving revision 1.51.2.8
diff -u -r1.51.2.8 bootstrap
--- bootstrap 25 Apr 2005 15:06:43 -0000 1.51.2.8
+++ bootstrap 23 Aug 2005 11:20:06 -0000
@@ -38,6 +38,8 @@
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 @@
# 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