changeset 9685:1032b397b15a draft

(svn r13791) -Fix(r13790): Don refer to variables when their value isn't set as expected
author skidd13 <skidd13@openttd.org>
date Tue, 22 Jul 2008 22:36:07 +0000
parents cd3853d469ce
children 0747b3e05e45
files config.lib
diffstat 1 files changed, 11 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/config.lib
+++ b/config.lib
@@ -32,13 +32,7 @@
 	personal_dir="1"
 	shared_dir="1"
 	install_dir="/"
-	if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ]; then
-		with_menu_entry="1"
-		menu_dir="share/applications"
-	else
-		with_menu_entry="0"
-		menu_dir=""
-	fi
+	menu_dir=""
 	menu_group="Game;"
 	enable_debug="0"
 	enable_desync_debug="0"
@@ -56,6 +50,7 @@
 	enable_cocoa_quickdraw="1"
 	with_osx_sysroot="1"
 	with_application_bundle="1"
+	with_menu_entry="2"
 	with_sdl="1"
 	with_cocoa="1"
 	with_zlib="1"
@@ -872,6 +867,15 @@
 	else
 		log 1 "installation directory... none"
 	fi
+
+	if [ "$with_menu_entry" = "2" ]; then
+		if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ]; then
+			with_menu_entry="1"
+			menu_dir="share/applications"
+		else
+			with_menu_entry="0"
+		fi
+	fi
 }
 
 make_cflags_and_ldflags() {