Permalink
Browse files

Merge remote-tracking branch 'origin/spacey'

This enables NQP to build with source path and/or prefix containing
spaces, given a sufficiently new parrot (RELEASE_5_0_0-8-g6ab9fdc).
On older parrots, nothing should be broken. I hope. (Famous last words).
  • Loading branch information...
2 parents c9bc4a2 + ae3b47d commit 1db6167740f7306a0e3acf04ccb15dfcc27c3dcb @moritz moritz committed Feb 14, 2013
Showing with 10 additions and 10 deletions.
  1. +7 −7 tools/build/Makefile.in
  2. +3 −3 tools/lib/NQP/Configure.pm
View
14 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@
View
6 tools/lib/NQP/Configure.pm
@@ -83,7 +83,7 @@ sub read_config {
my %config = ();
for my $file (@config_src) {
no warnings;
- if (open my $CONFIG, '-|', "$file --show-config") {
+ if (open my $CONFIG, '-|', qq["$file" --show-config]) {
while (<$CONFIG>) {
if (/^([\w:]+)=(.*)/) { $config{$1} = $2 }
}
@@ -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");

0 comments on commit 1db6167

Please sign in to comment.