* automake.in (handle_dist_worker): If DIST_SUBDIRS defined, use

	it even when SUBDIRS not conditional.

diff --git a/ChangeLog b/ChangeLog
index 633f08f..1b5d16b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Sun Sep 27 20:02:21 1998  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (handle_dist_worker): If DIST_SUBDIRS defined, use
+       it even when SUBDIRS not conditional.
+
        * automake.in (quote_cond_val): Turn tabs into \003.
        (unquote_cond_val): Turn \003 back into tabs.  Fixes test
        cond6.test.

diff --git a/TODO b/TODO
index 073eb89..5efc865 100644 (file)
--- a/TODO
+++ b/TODO
@@ -23,6 +23,8 @@
   what is the fix?
   ANSWER: for each dependency foo.h, make a dummy target `foo.h:'
   in the .P file.  Then the right thing ought to happen
+  [ No, that won't work if the .h file is auto-generated
+    instead must rely on a fix in make ]
 
 * If you suppress an internal variable by specifying a variable
   in a Makefile.am, but the variable is conditional, then automake
@@ -40,6 +42,7 @@ DONE: but needs to be documented
 
 * quoting bugs
   - how to install file with a space in its name?
+  [ don't bother with this -- make is just too losing ]
 
 * "make diff" capability
   look at gcc's Makefile.in to see what to do
@@ -77,8 +80,6 @@ DONE: but needs to be documented
   Yuck!
 * missing should handle install -d and rmdir -p (for uninstall)
 
-* allow 'cygnus' in AUTOMAKE_OPTIONS
-
 * a couple ways to be smarter:
   - notice when a .c file is a target somewhere, and auto-add it to
     BUILT_SOURCES

diff --git a/automake.in b/automake.in
index 168ee4c..b865e1a 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2503,12 +2503,11 @@ sub handle_dist_worker
     if (&variable_defined ('SUBDIRS'))
     {
        # If SUBDIRS is conditionally defined, then set DIST_SUBDIRS
-       # to all possible directories, and use it.
-       if (! &variable_conditions ('SUBDIRS'))
-       {
-           $dist_subdir_name = 'SUBDIRS';
-       }
-       else
+       # to all possible directories, and use it.  If DIST_SUBDIRS is
+       # defined, just use it.
+       local ($dist_subdir_name);
+       if (&variable_conditions ('SUBDIRS')
+           || &variable_defined ('DIST_SUBDIRS'))
        {
            $dist_subdir_name = 'DIST_SUBDIRS';
            if (! &variable_defined ('DIST_SUBDIRS'))
@@ -2518,6 +2517,10 @@ sub handle_dist_worker
                                                                  'all'));
            }
        }
+       else
+       {
+           $dist_subdir_name = 'SUBDIRS';
+       }
 
        # Test for directory existence here because previous automake
        # invocation might have created some directories.  Note that