Fix a bug where conditional variables weren't being expanded correctly.

diff --git a/.cvsignore b/.cvsignore
index 0089c57..c49c6da 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -11,6 +11,13 @@ makebook*
 *.dep *.dvi *.toc *.aux *.log
 *.cp *.cps *.fn *.fns *.vr *.vrs *.tp *.tps *.ky *.kys *.pg *.pgs
 
+README aclocal.m4 config.h.in config.h configure Makefile.in
+build.sh.in build.sh SMakefile config.ami README.DOS Makefile.DOS configh.dos
+NMakefile config.h.W32 config.h-vms glob/Makefile.in
+
+.deps .dep_segment glob/.deps
+
+_*
 sun4 i386 i386-netbsd hp300-netbsd hp300 rs6000 sun3 news800 amiga
 hp700 hp834 mips sol2 i486-linux
 

diff --git a/ChangeLog b/ChangeLog
index 01108a2..767504f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-03-04  Paul D. Smith  <psmith@gnu.org>
+
+       * variable.c (try_variable_definition): If we see a conditional
+       variable and we decide to set it, re-type it as recursive so it
+       will be expanded properly later.
+
 1999-02-22  Paul D. Smith  <psmith@gnu.org>
 
        * NEWS: Mention new .LIBPATTERNS feature.

diff --git a/variable.c b/variable.c
index 648f82b..c0a2199 100644 (file)
--- a/variable.c
+++ b/variable.c
@@ -792,6 +792,7 @@ try_variable_definition (flocp, line, origin)
           free(expanded_name);
           return v;
         }
+      flavor = f_recursive;
       /* FALLTHROUGH */
     case f_recursive:
       /* A recursive variable definition "var = value".