diff options
| author | Tom Tromey <tromey@redhat.com> | 1996-03-25 02:58:35 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 1996-03-25 02:58:35 +0000 |
| commit | 44f4427223131d64d832d3f042c234149262d869 (patch) | |
| tree | 9fa4afc489870c0c663d21e6e3849ce8f464d0df | |
| parent | 74bcd72a14f0664ac3149a757d65ff2af634633a (diff) | |
| download | automake-44f4427223131d64d832d3f042c234149262d869.tar.gz | |
Bug fixes
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | TODO | 12 | ||||
| -rwxr-xr-x | automake.in | 3 | ||||
| -rw-r--r-- | data.am | 2 | ||||
| -rw-r--r-- | lib/am/data.am | 2 |
5 files changed, 21 insertions, 7 deletions
@@ -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 @@ -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 82b0fa18f..bfee1f06a 100755 --- 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); } @@ -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 4c5be281c..ea021e4a6 100644 --- 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 |