From 7cb5bf9c1215064c56808242cffb13f8fe62c7cb Mon Sep 17 00:00:00 2001 From: skidd13 Date: Tue, 22 Jul 2008 23:11:40 +0000 Subject: [PATCH] (svn r13793) -Codechange: Unify the dir checking in config.lib --- config.lib | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/config.lib b/config.lib index c8ce9eba63..dc5830b529 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 }