changeset 9687:d78b2ef46bf8 draft

(svn r13793) -Codechange: Unify the dir checking in config.lib
author skidd13 <skidd13@openttd.org>
date Tue, 22 Jul 2008 23:11:40 +0000
parents 0747b3e05e45
children 5b73ae20c108
files config.lib
diffstat 1 files changed, 15 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/config.lib
+++ b/config.lib
@@ -847,6 +847,16 @@
 		fi
 	fi
 
+	if [ "$with_menu_entry" = "2" ]; then
+		# add a freedesktop menu item only for some UNIX systems
+		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
+
 	if [ -n "$personal_dir" ]
 	then
 		log 1 "personal home directory... $personal_dir"
@@ -868,13 +878,11 @@
 		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
+	if [ -n "$menu_dir" ]
+	then
+		log 1 "menu item directory... $menu_dir"
+	else
+		log 1 "menu item directory... none"
 	fi
 }