From: Tom Tromey Date: Thu, 11 Mar 1999 22:31:02 +0000 (+0000) Subject: From Ralf Corsepius. Fixes lex3.test. X-Git-Tag: user-dep-gen-branchpoint~27 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=6b2a4c14971f091010c463964271bc8cd51acd93;p=automake.git 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 677aef63..6be2b763 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +1999-03-11 Tom Tromey + + 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 + + * subdirs.am (maintainer-clean-recursive): Changed "&&" into "if" + construct to work around FreeBSD make/sh problem. From Rich Wales. + 1999-03-01 Tom Tromey Fixes from Pavel Roskin: diff --git a/THANKS b/THANKS index ae4bb1d6..aa41f2cc 100644 --- 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 4923c9ab..26fef5f2 100755 --- 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 f3642933..ab96f5b6 100644 --- 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 f3642933..ab96f5b6 100644 --- 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"; \