Changeset - r5923:99223404db7c
[Not reviewed]
master
0 1 0
maedhros - 18 years ago 2007-02-03 09:54:42
maedhros@openttd.org
(svn r8551) -Fix (r7759): Use ${} instead of $() for variables.
1 file changed with 2 insertions and 2 deletions:
0 comments (0 inline, 0 general)
config.lib
Show inline comments
 
@@ -503,30 +503,30 @@ check_params() {
 

	
 
			log 1 "checking OSX application bundle... not OSX, skipping"
 
		else
 
			log 1 "configure: error: --with-application-bundle only works if OSX is the target"
 
			exit 1
 
		fi
 
	fi
 

	
 
	if [ "$os" = "OSX" ] && [ "$with_application_bundle" = "1" ]; then
 
		OSXAPP="OpenTTD.app"
 

	
 
# TODO: remove next few lines of code when the search path patch has been applied
 
		if [ -n "$custom_lang_dir" ] && [ "$custom_lang_dir" != "$(OSXAPP)/Contents/Lang/" ]; then
 
		if [ -n "$custom_lang_dir" ] && [ "$custom_lang_dir" != "${OSXAPP}/Contents/Lang/" ]; then
 
			log 1 "configure: error: --custom-lang-dir and --with-application-bundle are not compatible
 
			exit 1
 
		fi
 

	
 
		if [ -n "$custom_lang_dir" ] && [ "$second_data_dir" != "$(OSXAPP)/Contents/Data/" ]; then
 
		if [ -n "$custom_lang_dir" ] && [ "$second_data_dir" != "${OSXAPP}/Contents/Data/" ]; then
 
			log 1 "configure: error: --second-data-dir and --with-application-bundle are not compatible
 
			exit 1
 
		fi
 

	
 
		custom_lang_dir="${OSXAPP}/Contents/Lang/"
 
		second_data_dir="${OSXAPP}/Contents/Data/"
 
# TODO: remove till here
 
	else
 
		OSXAPP=""
 
	fi
 

	
 
	if [ "$os" = "OSX" ]; then
0 comments (0 inline, 0 general)