Bug fixes

diff --git a/ChangeLog b/ChangeLog
index ada0acd..66ea240 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sun Mar 24 19:56:28 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * automake.in (am_install_var): Don't look in EXTRA_primary
+       variable any more; it is handled in the main loop.
+
+Wed Mar 20 16:22:35 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * data.am (install-@DIR@DATA): Find data in srcdir.
+
 Fri Mar 15 18:30:31 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * automake.in (require_config_file): Use correct filename when

diff --git a/TODO b/TODO
index 9a37e9e..b24b612 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,6 +1,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
 
 Other priorities:
 * Must rewrite am_install_var.  Should break into multiple functions.
@@ -12,8 +13,15 @@ Currently gettext requires @INTLSUB@ and @POSUB@ in SUBDIRS.  In the
 future this will be just intl and po.  When that happens, re-enable
 warnings in handle_subdirs.
 
+Consider supporting guile-style PLUGIN directories automatically?
+
+Consider allowing eg "foo/bar" to appear in EXTRA_DIST, and generating
+code to make directory foo at dist time
+
 Consider allowing mkinstalldirs, mdate-sh, and others to be put in
-AC_CONFIG_AUX_DIR.  Maybe even ansi2knr?
+AC_CONFIG_AUX_DIR.  Maybe even ansi2knr?  [ Do this! ]
+
+Check to make sure various scripts are executable.
 
 Testing: allow support for Cygnus-style dejagnu-based test suites via
 an option

diff --git a/automake.in b/automake.in
index 82b0fa1..bfee1f0 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2573,9 +2573,6 @@ sub am_install_var
     push (@all, '$(' . $primary . ')')
        if $do_all && @used;
 
-    push (@result, split (/\s+/, $contents{'EXTRA_' . $primary}))
-       if defined $contents{'EXTRA_' . $primary};
-
     return (@result);
 }
 

diff --git a/data.am b/data.am
index 4c5be28..ea021e4 100644 (file)
--- a/data.am
+++ b/data.am
@@ -20,7 +20,7 @@ install-@DIR@DATA: $(@DIR@_DATA)
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
        list="$(@DIR@_DATA)"; for p in $$list; do \
-         if test -f $$p; then \
+         if test -f $(srcdir)/$$p; then \
            $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p; \
          fi; \
        done

diff --git a/lib/am/data.am b/lib/am/data.am
index 4c5be28..ea021e4 100644 (file)
--- a/lib/am/data.am
+++ b/lib/am/data.am
@@ -20,7 +20,7 @@ install-@DIR@DATA: $(@DIR@_DATA)
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
        list="$(@DIR@_DATA)"; for p in $$list; do \
-         if test -f $$p; then \
+         if test -f $(srcdir)/$$p; then \
            $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p; \
          fi; \
        done