mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-08-19 04:29:09 +00:00
(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
This commit is contained 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 " Going to reconfigure with last known settings..."
|
||||||
@echo "----------------"
|
@echo "----------------"
|
||||||
# Make sure we don't lock config.cache
|
# 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 "----------------"
|
||||||
@echo "Reconfig done. Now compiling..."
|
@echo "Reconfig done. Now compiling..."
|
||||||
@echo "----------------"
|
@echo "----------------"
|
||||||
|
@@ -823,7 +823,7 @@ check_params() {
|
|||||||
if [ "$shared_dir" = "1" ]; then
|
if [ "$shared_dir" = "1" ]; then
|
||||||
# we are using default values
|
# we are using default values
|
||||||
if [ "$os" = "OSX" ]; then
|
if [ "$os" = "OSX" ]; then
|
||||||
shared_dir='/Library/Application\\ Support/OpenTTD'
|
shared_dir="/Library/Application\\\\ Support/OpenTTD"
|
||||||
else
|
else
|
||||||
shared_dir=""
|
shared_dir=""
|
||||||
fi
|
fi
|
||||||
|
2
configure
vendored
2
configure
vendored
@@ -37,7 +37,7 @@ if [ "$1" = "--reconfig" ] || [ "$1" = "--reconfigure" ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
# Make sure we don't lock config.cache
|
# Make sure we don't lock config.cache
|
||||||
cat config.cache > cache.tmp
|
cat config.cache | sed 's/\\ /\\\\ /g' > cache.tmp
|
||||||
sh cache.tmp
|
sh cache.tmp
|
||||||
rm -f cache.tmp
|
rm -f cache.tmp
|
||||||
exit $?
|
exit $?
|
||||||
|
Reference in New Issue
Block a user