diff --git a/Makefile b/Makefile
index 5985e47..620da82 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ else
 	CXXFLAGS := -pipe -O3 -fno-rtti -fno-exceptions -DNDEBUG
 endif
 
-CXXFLAGS += $(libsndfile_CFLAGS) $(LASH_CFLAGS) $(FLTK_CFLAGS) -DINSTALL_PREFIX=\"$(prefix)\" -DVERSION=\"$(VERSION)\"
+CXXFLAGS += $(libsndfile_CFLAGS) $(LASH_CFLAGS) $(FLTK_CFLAGS) -DINSTALL_PREFIX="\"$(prefix)\"" -DVERSION=\"$(VERSION)\"
 
 include scripts/colors
 
diff --git a/scripts/config-funcs b/scripts/config-funcs
index 229707a..a640ef8 100644
--- a/scripts/config-funcs
+++ b/scripts/config-funcs
@@ -59,7 +59,7 @@ using ()
 
 extract_options ()
 {
-    local line;
+    local line name value
 
     if [ -f make.conf ]
     then
@@ -75,7 +75,9 @@ extract_options ()
                 then
                     break
                 else
-                    eval "$line"
+                    name=${line%=*}
+                    value=${line#*=}
+                    eval "$name='$value'"
                 fi
             done
         } < make.conf