From: Tom Tromey Date: Tue, 26 Mar 1996 21:43:07 +0000 (+0000) Subject: Random bug fixes X-Git-Tag: Release-0-32~26 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6f31e3247c1b2e7bcd0087f43a306f41207a8d3;p=thirdparty%2Fautomake.git Random bug fixes --- diff --git a/ChangeLog b/ChangeLog index 66ea2403f..e2c0e47d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Tue Mar 26 13:47:54 1996 Tom Tromey + + * Makefile.am (cvs-dist): Find NEWS in srcdir. + * automake.in (handle_dist_worker): Find NEWS in srcdir. + ($RULE_PATTERN): Include chars "$(){}/" in allowable patterns in a + rule. + +Mon Mar 25 15:32:57 1996 Tom Tromey + + * data.am (install-@DIR@DATA): Also allow data to be in build + directory. + Sun Mar 24 19:56:28 1996 Tom Tromey * automake.in (am_install_var): Don't look in EXTRA_primary diff --git a/Makefile.am b/Makefile.am index a83c8b32a..15ca3c6fe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -66,7 +66,7 @@ maintainer-check: automake check # Tag before making distribution. Also, don't make a distribution if # checks fail. Also, make sure the NEWS file is up-to-date. cvs-dist: maintainer-check - @if sed 1q NEWS | grep -e "$(VERSION)" > /dev/null; then :; else \ + @if sed 1q $(srcdir)/NEWS | grep -e "$(VERSION)" > /dev/null; then :; else \ echo "NEWS not updated; not releasing" 1>&2; \ exit 1; \ fi diff --git a/Makefile.in b/Makefile.in index 43bddba7c..c54590f62 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 0.31 from Makefile.am +# Makefile.in generated automatically by automake 0.32 from Makefile.am # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -115,27 +115,27 @@ automake: $(top_builddir)/config.status automake.in install-binSCRIPTS: $(bin_SCRIPTS) $(top_srcdir)/mkinstalldirs $(bindir) - for p in $(bin_SCRIPTS); do \ - if test -f $$p; then \ + list="$(bin_SCRIPTS)"; for p in $$list; do \ + if test -f $$p; then \ $(INSTALL_SCRIPT) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ - else :; fi; \ + else :; fi; \ done uninstall-binSCRIPTS: - for p in $(bin_SCRIPTS); do \ + list="$(bin_SCRIPTS)"; for p in $$list; do \ rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \ done install-pkgdataSCRIPTS: $(pkgdata_SCRIPTS) $(top_srcdir)/mkinstalldirs $(pkgdatadir) - for p in $(pkgdata_SCRIPTS); do \ - if test -f $$p; then \ + list="$(pkgdata_SCRIPTS)"; for p in $$list; do \ + if test -f $$p; then \ $(INSTALL_SCRIPT) $$p $(pkgdatadir)/`echo $$p|sed '$(transform)'`; \ - else :; fi; \ + else :; fi; \ done uninstall-pkgdataSCRIPTS: - for p in $(pkgdata_SCRIPTS); do \ + list="$(pkgdata_SCRIPTS)"; for p in $$list; do \ rm -f $(pkgdatadir)/`echo $$p|sed '$(transform)'`; \ done @@ -199,13 +199,17 @@ maintainer-clean-info: install-pkgdataDATA: $(pkgdata_DATA) $(top_srcdir)/mkinstalldirs $(pkgdatadir) - for p in $(pkgdata_DATA); do \ - $(INSTALL_DATA) $(srcdir)/$$p $(pkgdatadir)/$$p; \ + list="$(pkgdata_DATA)"; for p in $$list; do \ + if test -f $(srcdir)/$$p; then \ + $(INSTALL_DATA) $(srcdir)/$$p $(pkgdatadir)/$$p; \ + else if test -f $$p; then \ + $(INSTALL_DATA) $$p $(pkgdatadir)/$$p; \ + fi; fi; \ done uninstall-pkgdataDATA: - for p in $(pkgdata_DATA); do \ - rm -f $(pkgdatadir)/$$p; \ + list="$(pkgdata_DATA)"; for p in $$list; do \ + rm -f $(pkgdatadir)/$$p; \ done # This directory's subdirectories are mostly independent; you can cd @@ -397,7 +401,7 @@ maintainer-check: automake check # Tag before making distribution. Also, don't make a distribution if # checks fail. Also, make sure the NEWS file is up-to-date. cvs-dist: maintainer-check - @if sed 1q NEWS | grep -e "$(VERSION)" > /dev/null; then :; else \ + @if sed 1q $(srcdir)/NEWS | grep -e "$(VERSION)" > /dev/null; then :; else \ echo "NEWS not updated; not releasing" 1>&2; \ exit 1; \ fi diff --git a/TODO b/TODO index b24b612aa..30643cdb1 100644 --- a/TODO +++ b/TODO @@ -2,6 +2,7 @@ Priorities for release: * For 0.32: remove last mention of DIST_OTHER, DIST_SUBDIRS * Only require AC_ARG_PROGRAM if a program installed this requires omitting vars in this case as well +* Add test case for recent RULE_PATTERN change Other priorities: * Must rewrite am_install_var. Should break into multiple functions. diff --git a/automake.in b/automake.in index bfee1f06a..9e1cedc76 100755 --- a/automake.in +++ b/automake.in @@ -37,7 +37,7 @@ $am_dir = "@datadir@/@PACKAGE@"; $IGNORE_PATTERN = "^##([^#].*)?\$"; $WHITE_PATTERN = "^[ \t]*\$"; $COMMENT_PATTERN = "^#"; -$RULE_PATTERN = "^([a-zA-Z_.][-.a-zA-Z0-9_.]*) *:"; +$RULE_PATTERN = "^([\$a-zA-Z_.][-.a-zA-Z0-9_(){}/]*) *:"; $MACRO_PATTERN = "^([A-Za-z][A-Za-z0-9_]*)[ \t]*=[ \t]*(.*)\$"; $BOGUS_MACRO_PATTERN = "^([^ \t]*)[ \t]*=[ \t]*(.*)\$"; @@ -1012,7 +1012,7 @@ sub handle_dist_worker { # For Gnits users, this is pretty handy. Look at 15 lines # in case some explanatory text is desirable. - $output_rules .= ' @if sed 15q NEWS | grep -e "$(VERSION)" > /dev/null; then :; else \\ + $output_rules .= ' @if sed 15q $(srcdir)/NEWS | grep -e "$(VERSION)" > /dev/null; then :; else \\ echo "NEWS not updated; not releasing" 1>&2; \\ exit 1; \\ fi diff --git a/data.am b/data.am index ea021e4a6..8ea1a47eb 100644 --- a/data.am +++ b/data.am @@ -22,7 +22,9 @@ install-@DIR@DATA: $(@DIR@_DATA) list="$(@DIR@_DATA)"; for p in $$list; do \ if test -f $(srcdir)/$$p; then \ $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p; \ - fi; \ + else if test -f $$p; then \ + $(INSTALL_DATA) $$p $(@DIR@dir)/$$p; \ + fi; fi; \ done uninstall-@DIR@DATA: diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am index a83c8b32a..15ca3c6fe 100644 --- a/lib/am/Makefile.am +++ b/lib/am/Makefile.am @@ -66,7 +66,7 @@ maintainer-check: automake check # Tag before making distribution. Also, don't make a distribution if # checks fail. Also, make sure the NEWS file is up-to-date. cvs-dist: maintainer-check - @if sed 1q NEWS | grep -e "$(VERSION)" > /dev/null; then :; else \ + @if sed 1q $(srcdir)/NEWS | grep -e "$(VERSION)" > /dev/null; then :; else \ echo "NEWS not updated; not releasing" 1>&2; \ exit 1; \ fi diff --git a/lib/am/data.am b/lib/am/data.am index ea021e4a6..8ea1a47eb 100644 --- a/lib/am/data.am +++ b/lib/am/data.am @@ -22,7 +22,9 @@ install-@DIR@DATA: $(@DIR@_DATA) list="$(@DIR@_DATA)"; for p in $$list; do \ if test -f $(srcdir)/$$p; then \ $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p; \ - fi; \ + else if test -f $$p; then \ + $(INSTALL_DATA) $$p $(@DIR@dir)/$$p; \ + fi; fi; \ done uninstall-@DIR@DATA: