Map Guile variable objects to the empty string.

In Guile 2.0, (define ...) results in a variable object.  Ensure make
converts that to an empty string to avoid spurious errors.

diff --git a/ChangeLog b/ChangeLog
index 9cbb1e61e3eb4a8a58b1c49a739539290fc9f369..f046a0f544bd86e5682343f22719a94bea998d3e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-01-29  Paul Smith  <psmith@gnu.org>
 
+       * gmk-default.scm (to-string-maybe): Variables map to empty strings.
+       In Guile 2.0, (define ...) results in a variable object so make
+       sure that maps to an empty string in make.
+
        * variable.c (parse_variable_definition): New POSIX assignment ::=
        Take a struct variable to return more information after parsing.
        (assign_variable_definition): New parse_variable_definition() call.

diff --git a/gmk-default.scm b/gmk-default.scm
index 9aca54a52aa4cc512318cfac3fb6d648b087d73b..4dabe25d5ac958b435676f209ee50ba2d1ea7ec7 100644 (file)
--- a/gmk-default.scm
+++ b/gmk-default.scm
@@ -20,6 +20,7 @@
    ;; In GNU make, "false" is the empty string
    ((or (not x)
         (unspecified? x)
+        (variable? x)
         (null? x)
         (and (string? x) (string-null? x)))
     #f)