summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2008-01-14 20:30:05 +0000
committerbjarni <bjarni@openttd.org>2008-01-14 20:30:05 +0000
commit57ecf117c94e070f0aa267ecc0071e6ddabbb115 (patch)
tree93a05a168c1a95339b5bb5039e848529ff81cd3a
parent277ec663cbfb65b791f84e252d9d64b2be542d15 (diff)
downloadopenttd-57ecf117c94e070f0aa267ecc0071e6ddabbb115.tar.xz
(svn r11853) -Fix [r11837]: [OSX] reconfigure killed the space in shared-dir
Thanks to TrueLight for finding the solution to this one Note: if the shared-dir setting is already broken due to this then you have to manually run configure again
-rw-r--r--Makefile.in2
-rw-r--r--config.lib2
-rwxr-xr-xconfigure2
3 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in
index 906119d5e..73e500ac5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -79,7 +79,7 @@ ifeq ($(shell if test -f config.cache; then echo 1; fi), 1)
@echo " Going to reconfigure with last known settings..."
@echo "----------------"
# Make sure we don't lock config.cache
- @$(shell cat config.cache) || exit 1
+ @$(shell cat config.cache | sed 's/\\ /\\\\ /g') || exit 1
@echo "----------------"
@echo "Reconfig done. Now compiling..."
@echo "----------------"
diff --git a/config.lib b/config.lib
index 3b13c2f77..e8b33e96f 100644
--- a/config.lib
+++ b/config.lib
@@ -823,7 +823,7 @@ check_params() {
if [ "$shared_dir" = "1" ]; then
# we are using default values
if [ "$os" = "OSX" ]; then
- shared_dir='/Library/Application\\ Support/OpenTTD'
+ shared_dir="/Library/Application\\\\ Support/OpenTTD"
else
shared_dir=""
fi
diff --git a/configure b/configure
index 31843f0b9..1c6aaa719 100755
--- a/configure
+++ b/configure
@@ -37,7 +37,7 @@ if [ "$1" = "--reconfig" ] || [ "$1" = "--reconfigure" ]; then
exit 1
fi
# Make sure we don't lock config.cache
- cat config.cache > cache.tmp
+ cat config.cache | sed 's/\\ /\\\\ /g' > cache.tmp
sh cache.tmp
rm -f cache.tmp
exit $?