* mkstamp: move the sed script to extract revision and date

information into a separate shell-script, so that we can break
lines between commands; FreeBSD's sed doesn't like `;' after `t'
Reported by Axel Thimm <Axel.Thimm@physik.fu-berlin.de>
* Makefile.am: use mkstamp
* THANKS: added Axel Thimm

diff --git a/ChangeLog b/ChangeLog
index 84e3e700a84769b8efaa91063c86030db66bd256..ceca2f14e3fcd19a8e29858c9a18b0085d7dcdd6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 1999-01-25  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+       * mkstamp: move the sed script to extract revision and date
+       information into a separate shell-script, so that we can break
+       lines between commands; FreeBSD's sed doesn't like `;' after `t'
+       Reported by Axel Thimm <Axel.Thimm@physik.fu-berlin.de>
+       * Makefile.am: use mkstamp
+       * THANKS: added Axel Thimm
+       
        * ltmain.in: don't try to use .o instead of .lo just because
        there's no PIC flag.  It loses if --disable-static, and there's
        not much point if we're referring to the same file anyway...

diff --git a/Makefile.am b/Makefile.am
index ba6f0fdb8fa9baa63c2a1f5798ae8d6703e7f716..4bac3855a7f5539c4994f0c63dc77d7c78f0c091 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,8 +61,7 @@ update-timestamps:
 # Line numbering transliterated from a section in autoconf (Autoconf 2.12).
 $(srcdir)/ltconfig: $(srcdir)/ltconfig.in $(top_srcdir)/configure.in $(TSDEPS)
        rm -f ltconfig.T
-       date=`sed 's%.*\$$''Revision: \([^$$]*\) \$$ \$$''Date: \([^$$]*\) \$$.*% (\1 \2)%;t end;d;: end' \
-               < $(srcdir)/ChangeLog` && \
+       date=`$(SHELL) $(srcdir)/mkstamp < $(srcdir)/ChangeLog` && \
        $(AWK) '/@LINENO@/ { printf "%d:", NR } { print }' $(srcdir)/ltconfig.in | \
          sed -e 's/@''PACKAGE@/@PACKAGE@/' -e 's/@''VERSION@/@VERSION@/' \
              -e "s%@""TIMESTAMP@%$$date%" \
@@ -74,8 +73,7 @@ $(srcdir)/ltconfig: $(srcdir)/ltconfig.in $(top_srcdir)/configure.in $(TSDEPS)
 
 $(srcdir)/ltmain.sh: $(srcdir)/ltmain.in $(top_srcdir)/configure.in $(TSDEPS)
        rm -f ltmain.shT
-       date=`sed 's%.*\$$''Revision: \([^$$]*\) \$$ \$$''Date: \([^$$]*\) \$$.*% (\1 \2)%;t end;d;: end' \
-               < $(srcdir)/ChangeLog` && \
+       date=`$(SHELL) $(srcdir)/mkstamp < $(srcdir)/ChangeLog` && \
        sed -e 's/@''PACKAGE@/@PACKAGE@/' -e 's/@''VERSION@/@VERSION@/' \
            -e "s%@""TIMESTAMP@%$$date%" $(srcdir)/ltmain.in > ltmain.shT
        mv -f ltmain.shT $@ || \

diff --git a/THANKS b/THANKS
index 24ab807b3482c01d4f92b0db488c39796da6b628..948c59cabac67b80799360fd81e4207bcf970717 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -10,6 +10,7 @@ and generally assist in the libtool maintainership process:
 
 Akim Demaille <demaille@inf.enst.fr>
 Andrey Slepuhin <pooh@msu.ru>
+Axel Thimm <Axel.Thimm@physik.fu-berlin.de>
 Bruno Haible <haible@ilog.fr>
 Carl D. Roth <roth@cse.ucsc.edu>
 Charles S. Kerr <cskerr@delenn.jccbi.gov>

diff --git a/mkstamp b/mkstamp
new file mode 100755 (executable)
index 0000000..08239af
--- /dev/null
+++ b/mkstamp
@@ -0,0 +1,37 @@
+#! /bin/sh
+
+# mkstamp - extract data from Revision and Date RCS tags in a file
+# Copyright (C) 1999 Free Software Foundation, Inc.
+# Alexandre Oliva <oliva@dcc.unicamp.br>
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This script expects to find a line containing both Revision and Date
+# tags, and it edits this line so that it looks line ` ($rev $date)'
+
+# Command-line arguments are passed down to sed; additional -e cmd
+# arguments are acceptable.  If no input filename is specified in the
+# command line, sed will read from stdin.
+
+exec sed -e '
+       s%.*\$''Revision: \([^$]*\) \$.*\$''Date: \([^$]*\) \$.*% (\1 \2)%
+       t end
+       d
+       : end' ${1+"$@"}