Allow spaces in install dir. TT #1716

parrot · Dec 1, 2010 · 05ab1f5 · 05ab1f5
1 parent 559ed82
commit 05ab1f5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/config/gen/makefiles/root.in b/config/gen/makefiles/root.in
@@ -25,16 +25,16 @@ CONFIG_ARGS     = @configure_args@
 # Override at least PREFIX with the install location if you're going
 # to be using this outside of your build area.
 BUILDPREFIX     =
-PREFIX          = @prefix@
-EXEC_PREFIX     = @exec_prefix@
+PREFIX          = "@prefix@"
+EXEC_PREFIX     = "@exec_prefix@"
 DESTDIR         =
-BIN_DIR         = @bindir@
-LIB_DIR         = @libdir@
-INCLUDE_DIR     = @includedir@
-DATA_DIR        = @datadir@
-DOC_DIR         = @docdir@
-VERSION_DIR     = @versiondir@
-
+BIN_DIR         = "@bindir@"
+LIB_DIR         = "@libdir@"
+INCLUDE_DIR     = "@includedir@"
+DATA_DIR        = "@datadir@"
+DOC_DIR         = "@docdir@"
+VERSION_DIR     = "@versiondir@"
+SRC_DIR         = "@srcdir@"
 
 ###############################################################################
 #
@@ -2570,7 +2570,7 @@ install-dev-only: installable
     --destdir=$(DESTDIR) \
     --docdir=$(DOC_DIR) \
     --datadir=$(DATA_DIR) \
-    --srcdir=@srcdir@ \
+    --srcdir=$(SRC_DIR) \
     --versiondir=$(VERSION_DIR) \
     MANIFEST MANIFEST.generated
 

diff --git a/config/inter/libparrot.pm b/config/inter/libparrot.pm
@@ -84,7 +84,7 @@ sub runstep {
                                      && $parrot_is_shared
                                      && $conf->data->get('rpath') )
         ? $conf->data->get('rpath')
-            . $conf->data->get('build_dir')
+            . '"' . $conf->data->get('build_dir') . '"'
             . '/'
             . $conf->data->get('blib_dir')
         : ''
@@ -96,7 +96,7 @@ sub runstep {
                                     && $parrot_is_shared
                                     && $conf->data->get('rpath') )
         ? $conf->data->get('rpath')
-            . $conf->data->get('libdir')
+            . '"' . $conf->data->get('libdir') . '"'
         : ''
     );