(svn r11853) -Fix [r11837]: [OSX] reconfigure killed the space in shared-dir
authorbjarni
Mon, 14 Jan 2008 20:30:05 +0000
changeset 8785 6b55b86eeff8
parent 8784 60dc8035b61b
child 8786 f626bd77974a
(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
Makefile.in
config.lib
configure
--- a/Makefile.in	Mon Jan 14 20:06:18 2008 +0000
+++ b/Makefile.in	Mon Jan 14 20:30:05 2008 +0000
@@ -79,7 +79,7 @@
 	@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 "----------------"
--- a/config.lib	Mon Jan 14 20:06:18 2008 +0000
+++ b/config.lib	Mon Jan 14 20:30:05 2008 +0000
@@ -823,7 +823,7 @@
 	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
--- a/configure	Mon Jan 14 20:06:18 2008 +0000
+++ b/configure	Mon Jan 14 20:30:05 2008 +0000
@@ -37,7 +37,7 @@
 		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 $?