+Tue Mar 26 13:47:54 1996 Tom Tromey <tromey@creche.cygnus.com>
+
+ * 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 <tromey@creche.cygnus.com>
+
+ * data.am (install-@DIR@DATA): Also allow data to be in build
+ directory.
+
Sun Mar 24 19:56:28 1996 Tom Tromey <tromey@creche.cygnus.com>
* automake.in (am_install_var): Don't look in EXTRA_primary
# 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
-# 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
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
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
# 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
* 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.
$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]*(.*)\$";
{
# 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
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:
# 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
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: