From Ralf Corsepius. Fixes lex3.test.

	* automake.in (lang_yacc_finish): Include `.' in name pushed onto
	maintainer-clean list.
	(lang_lex_finish): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 677aef63b917c4a4d5f212331b06096720c5d316..6be2b763013aae238c4e0813f55e96975cc06b3f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+1999-03-11  Tom Tromey  <tromey@cygnus.com>
+
+       From Ralf Corsepius.  Fixes lex3.test.
+       * automake.in (lang_yacc_finish): Include `.' in name pushed onto
+       maintainer-clean list.
+       (lang_lex_finish): Likewise.
+
+1999-03-02  Tom Tromey  <tromey@cygnus.com>
+
+       * subdirs.am (maintainer-clean-recursive): Changed "&&" into "if"
+       construct to work around FreeBSD make/sh problem.  From Rich Wales.
+
 1999-03-01  Tom Tromey  <tromey@cygnus.com>
 
        Fixes from Pavel Roskin:

diff --git a/THANKS b/THANKS
index ae4bb1d6859eb580a54a06f06a21cef4b10342f2..aa41f2cc73d967cd6a4bc4ab22bb73a1e23bbf06 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -80,8 +80,10 @@ Peter Mattis         petm@scam.XCF.Berkeley.EDU
 Petter Reinholdtsen    pere@hungry.com
 Phil Nelson            phil@cs.wwu.edu
 Raja R Harinath                harinath@cs.umn.edu
+Ralf Corsepius         corsepiu@faw.uni-ulm.de
 Ralph Schleicher       rs@purple.UL.BaWue.DE
 Ramón García Fernández ramon@jl1.quim.ucm.es
+Rich Wales             richw@webcom.com
 Rob Savoye             rob@cygnus.com
 Robert Bihlmeyer       robbe@orcus.priv.at
 Seth Alves             alves@hungry.com
@@ -91,3 +93,4 @@ The Crimson Binome    steve@nyongwa.montreal.qc.ca
 Thomas Morgan          tmorgan@pobox.com
 Tim Goodwin            tjg@star.le.ac.uk
 Ulrich Drepper         drepper@gnu.ai.mit.edu
+Werner Koch            wk@isil.d.shuttle.de

diff --git a/automake.in b/automake.in
index 4923c9ab2da9abd007c66b023512a874919ebecc..26fef5f2c8167a13839b218909d07314fd06baa1 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -4675,7 +4675,7 @@ sub lang_yacc_finish
        # statically, and the GNU rules say that yacc/lex output files
        # should be removed by maintainer-clean.  So that's what we
        # do.
-       push (@maintainer_clean_files, $base . $hname, $base . $cname);
+       push (@maintainer_clean_files, "${base}.${hname}", "${base}.${cname}");
     }
     $output_rules .= "\n";
 
@@ -4723,7 +4723,7 @@ sub lang_lex_finish
        # do.
        $file =~ /^(.*)\.(l|ll|l\+\+|lxx|lpp)$/;
        ($cname = $2) =~ tr/y/c/;
-       push (@maintainer_clean_files, $1 . $cname);
+       push (@maintainer_clean_files, "${1}.${cname}");
     }
 
     if (! defined $configure_vars{'LEX'})

diff --git a/lib/am/subdirs.am b/lib/am/subdirs.am
index f3642933b950341349278006bb212c00e3a0f2e3..ab96f5b6539d5c0f9d8526a472fcc4960bf96dac 100644 (file)
--- a/lib/am/subdirs.am
+++ b/lib/am/subdirs.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -59,7 +59,9 @@ maintainer-clean-recursive:
        dot_seen=no; \
        rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
          rev="$$subdir $$rev"; \
-         test "$$subdir" = "." && dot_seen=yes; \
+## FreeBSD make/sh will exit if the test fails and we use "&&";
+## hence the `if'.
+         if test "$$subdir" = "."; then dot_seen=yes; else :; fi; \
        done; \
 ## If we haven't seen `.', then add it at the beginning.
        test "$$dot_seen" = "no" && rev=". $$rev"; \

diff --git a/subdirs.am b/subdirs.am
index f3642933b950341349278006bb212c00e3a0f2e3..ab96f5b6539d5c0f9d8526a472fcc4960bf96dac 100644 (file)
--- a/subdirs.am
+++ b/subdirs.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -59,7 +59,9 @@ maintainer-clean-recursive:
        dot_seen=no; \
        rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
          rev="$$subdir $$rev"; \
-         test "$$subdir" = "." && dot_seen=yes; \
+## FreeBSD make/sh will exit if the test fails and we use "&&";
+## hence the `if'.
+         if test "$$subdir" = "."; then dot_seen=yes; else :; fi; \
        done; \
 ## If we haven't seen `.', then add it at the beginning.
        test "$$dot_seen" = "no" && rev=". $$rev"; \