From 5b9440d94e416788b63ae8f348370998985128f2 Mon Sep 17 00:00:00 2001
From: Coke <will@coleda.com>
Date: Sun, 28 Nov 2010 01:17:15 -0500
Subject: [PATCH] Allow spaces in install dir.
TT #1716
---
config/gen/makefiles/root.in | 20 ++++++++++----------
config/inter/libparrot.pm | 4 ++--
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/config/gen/makefiles/root.in b/config/gen/makefiles/root.in
index 4d094ef..cf9192d 100644
a
|
b
|
|
24 | 24 | # Override at least PREFIX with the install location if you're going |
25 | 25 | # to be using this outside of your build area. |
26 | 26 | BUILDPREFIX = |
27 | | PREFIX = @prefix@ |
28 | | EXEC_PREFIX = @exec_prefix@ |
| 27 | PREFIX = "@prefix@" |
| 28 | EXEC_PREFIX = "@exec_prefix@" |
29 | 29 | DESTDIR = |
30 | | BIN_DIR = @bindir@ |
31 | | LIB_DIR = @libdir@ |
32 | | INCLUDE_DIR = @includedir@ |
33 | | DATA_DIR = @datadir@ |
34 | | DOC_DIR = @docdir@ |
35 | | VERSION_DIR = @versiondir@ |
36 | | |
| 30 | BIN_DIR = "@bindir@" |
| 31 | LIB_DIR = "@libdir@" |
| 32 | INCLUDE_DIR = "@includedir@" |
| 33 | DATA_DIR = "@datadir@" |
| 34 | DOC_DIR = "@docdir@" |
| 35 | VERSION_DIR = "@versiondir@" |
| 36 | SRC_DIR = "@srcdir@" |
37 | 37 | |
38 | 38 | ############################################################################### |
39 | 39 | # |
… |
… |
|
2564 | 2564 | --destdir=$(DESTDIR) \ |
2565 | 2565 | --docdir=$(DOC_DIR) \ |
2566 | 2566 | --datadir=$(DATA_DIR) \ |
2567 | | --srcdir=@srcdir@ \ |
| 2567 | --srcdir=$(SRC_DIR) \ |
2568 | 2568 | --versiondir=$(VERSION_DIR) \ |
2569 | 2569 | MANIFEST MANIFEST.generated |
2570 | 2570 | |
diff --git a/config/inter/libparrot.pm b/config/inter/libparrot.pm
index d07d7de..d2d6a15 100644
a
|
b
|
|
84 | 84 | && $parrot_is_shared |
85 | 85 | && $conf->data->get('rpath') ) |
86 | 86 | ? $conf->data->get('rpath') |
87 | | . $conf->data->get('build_dir') |
| 87 | . '"' . $conf->data->get('build_dir') . '"' |
88 | 88 | . '/' |
89 | 89 | . $conf->data->get('blib_dir') |
90 | 90 | : '' |
… |
… |
|
96 | 96 | && $parrot_is_shared |
97 | 97 | && $conf->data->get('rpath') ) |
98 | 98 | ? $conf->data->get('rpath') |
99 | | . $conf->data->get('libdir') |
| 99 | . '"' . $conf->data->get('libdir') . '"' |
100 | 100 | : '' |
101 | 101 | ); |
102 | 102 | |