Allow commentary on serial line

5 files changed, 21 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 41cdb1445..c308367b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Nov 20 00:23:42 1996  Tom Tromey  <tromey@cygnus.com>
+
+	* acinstall: Allow commentary at end of "serial" line.  From Gord
+	Matzigkeit.
+
+	* automake.in (handle_yacc_lex_cxx): Only replace output header if
+	it has changed.
+
 Tue Nov 19 19:03:30 1996  Tom Tromey  <tromey@cygnus.com>
 
 	* automake.in (am_primary_prefixes): Allow configure variables to
diff --git a/TODO b/TODO
index d8916a549..6648a4fd9 100644
--- a/TODO
+++ b/TODO
@@ -13,6 +13,11 @@ Priorities for release:
 * consider adding pkglibexecdir, maybe others?
   requests for pkg-dirs with version included
 
+Fix ansi2knr so that knr-style function decls aren't incorrectly
+rewritten.  Or, fix automake so that not all sources in a directory
+must be ansi.  Should also fix things so that a separate ._o file is
+not needed; instead use a wrapper script.
+
 Gord on pretty-printing instead of raw loops:
 Gord> I think the best thing to do is to have make output be a valid shell
 Gord> script, and to have it be clear exactly what is happening at a given
diff --git a/acinstall b/acinstall
index 7f9e9091a..edb8ddda9 100755
--- a/acinstall
+++ b/acinstall
@@ -12,7 +12,7 @@ dir="$2"
 shift
 shift
 
-localserial="`grep '^# serial' $file | sed -e 's/^# serial //g'`"
+localserial=`grep '^# serial ' $file | sed -e 's/^# serial \([0-9][0-9]*\).*$/\1/; q'`
 if test -z "$localserial"; then
    echo "acinstall: no serial number in $file" 1>&2
    exit 1
@@ -20,7 +20,7 @@ fi
 
 # Maybe if the installed file has no serial number we should just
 # assume it is ancient.
-instserial="`grep '^# serial ' $dir/$file | sed -e 's/^# serial //g'`"
+instserial=`grep '^# serial ' $dir/$file | sed -e 's/^# serial \([0-9][0-9]*\).*$/\1/; q'`
 if test -z "$instserial"; then
    echo "acinstall: no serial number in $dir/$file" 1>&2
    exit 1
diff --git a/automake.in b/automake.in
index e6263fd4e..a44747d8b 100755
--- a/automake.in
+++ b/automake.in
@@ -690,8 +690,10 @@ sub handle_yacc_lex_cxx
 	}
 	else
 	{
-	    $output_rules .= ('$(YACC) $(YFLAGS) $< && mv y.tab.c $@' . "\n\t"
-			      . 'if test -f y.tab.h; then mv y.tab.h $*.h; else :; fi');
+	    $output_rules .= ('$(YACC) $(YFLAGS) $< && mv y.tab.c $@' . "\n"
+			      . "\tif test -f y.tab.h; then \\\n"
+			      . "\tif cmp -s y.tab.h \$*.h; then rm -f y.tab.h; else mv y.tab.h \$*.h; fi; \\\n"
+			      . "\telse :; fi");
 	}
 	$output_rules .= "\n";
 
diff --git a/lib/acinstall b/lib/acinstall
index 7f9e9091a..edb8ddda9 100755
--- a/lib/acinstall
+++ b/lib/acinstall
@@ -12,7 +12,7 @@ dir="$2"
 shift
 shift
 
-localserial="`grep '^# serial' $file | sed -e 's/^# serial //g'`"
+localserial=`grep '^# serial ' $file | sed -e 's/^# serial \([0-9][0-9]*\).*$/\1/; q'`
 if test -z "$localserial"; then
    echo "acinstall: no serial number in $file" 1>&2
    exit 1
@@ -20,7 +20,7 @@ fi
 
 # Maybe if the installed file has no serial number we should just
 # assume it is ancient.
-instserial="`grep '^# serial ' $dir/$file | sed -e 's/^# serial //g'`"
+instserial=`grep '^# serial ' $dir/$file | sed -e 's/^# serial \([0-9][0-9]*\).*$/\1/; q'`
 if test -z "$instserial"; then
    echo "acinstall: no serial number in $dir/$file" 1>&2
    exit 1