summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskidd13 <skidd13@openttd.org>2008-07-22 23:11:40 +0000
committerskidd13 <skidd13@openttd.org>2008-07-22 23:11:40 +0000
commit7cb5bf9c1215064c56808242cffb13f8fe62c7cb (patch)
tree482bff56d6e992023874f7ea655cd737b1588626
parent317207ce0c7abeebcc2a6e50e2e5607b5003737f (diff)
downloadopenttd-7cb5bf9c1215064c56808242cffb13f8fe62c7cb.tar.xz
(svn r13793) -Codechange: Unify the dir checking in config.lib
-rw-r--r--config.lib22
1 files changed, 15 insertions, 7 deletions
diff --git a/config.lib b/config.lib
index c8ce9eba6..dc5830b52 100644
--- a/config.lib
+++ b/config.lib
@@ -847,6 +847,16 @@ check_params() {
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 @@ check_params() {
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
}