more fixes to allow spacey paths

Raku · Feb 11, 2013 · ae3b47d · ae3b47d
1 parent 8282ac5
commit ae3b47d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in
@@ -4,12 +4,12 @@
 PARROT_ARGS      = -L. -X.
 
 # values from parrot_config
-PARROT_BIN_DIR     = @bindir@
-PARROT_LIB_SHARED  = @libparrot_shared@
-PARROT_VERSION     = @versiondir@
-PARROT_INCLUDE_DIR = @includedir@$(PARROT_VERSION)
-PARROT_LIB_DIR     = @libdir@$(PARROT_VERSION)
-PARROT_SRC_DIR     = @srcdir@$(PARROT_VERSION)
+PARROT_BIN_DIR     = "@bindir@"
+PARROT_LIB_SHARED  = "@libparrot_shared@"
+PARROT_VERSION     = "@versiondir@"
+PARROT_INCLUDE_DIR = "@includedir@$(PARROT_VERSION)"
+PARROT_LIB_DIR     = "@libdir@$(PARROT_VERSION)"
+PARROT_SRC_DIR     = "@srcdir@$(PARROT_VERSION)"
 PARROT_LIBRARY_DIR = $(PARROT_LIB_DIR)/library
 NQP_LANG_DIR       = $(PARROT_LIB_DIR)/languages/nqp
 HAS_ICU            = @has_icu@
@@ -24,7 +24,7 @@ LIBPARROT     = @inst_libparrot_ldflags@
 O             = @o@
 A             = @a@
 LOAD_EXT      = @load_ext@
-PERL          = @perl@
+PERL          = "@perl@"
 CP            = @cp@
 MV            = @mv@
 RM_F          = @rm_f@

diff --git a/tools/lib/NQP/Configure.pm b/tools/lib/NQP/Configure.pm
@@ -132,7 +132,7 @@ END
             }
             close($PARROT_CONFIG) or die $!;
         }
-        elsif (open my $PARROT, '-|', "$file parrot-config.pir") {
+        elsif (open my $PARROT, '-|', qq["$file" parrot-config.pir]) {
             while (<$PARROT>) {
                 if (/^([\w:]+)=(.*)/) { $config{$1} = $2 }
             }
@@ -290,7 +290,7 @@ sub gen_nqp {
         return $nqp_exe;
     }
 
-    my @cmd = ($^X, 'Configure.pl', "--with-parrot=$with_parrot",
+    my @cmd = ($^X, 'Configure.pl', qq[--with-parrot="$with_parrot"],
                "--make-install");
     print "Building NQP ...\n";
     chdir("$startdir/nqp");