From 409e3ca38fd706dde49bea1fb3efa32fee5a8056 Mon Sep 17 00:00:00 2001 From: fluxgen <fluxgen> Date: Thu, 22 May 2003 10:05:37 +0000 Subject: bug fix from Han --- util/fluxbox-generate_menu | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/util/fluxbox-generate_menu b/util/fluxbox-generate_menu index ace2290..161cd32 100755 --- a/util/fluxbox-generate_menu +++ b/util/fluxbox-generate_menu @@ -22,7 +22,7 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. # -# $Id: fluxbox-generate_menu,v 1.33 2003/05/12 19:55:07 fluxgen Exp $ +# $Id: fluxbox-generate_menu,v 1.34 2003/05/22 10:05:37 fluxgen Exp $ # # Portability notes: @@ -594,11 +594,12 @@ if [ -w "${FILENAME}" ]; then fi # packagedatadir +PREFIX="${PREFIX:=@PREFIX@}" if [ ! -d "${PKGDATADIR}" -o -z "${PKGDATADIR}" ]; then - if [ "`uname`" = "Linux" ]; then - PKGDATADIR=/usr/share - else + if [ "$PREFIX" = '@PREFIX@' ]; then PKGDATADIR=/usr/local/share + else + PKGDATADIR=${PREFIX}/share fi fi @@ -634,7 +635,7 @@ find_it $MY_BROWSER if [ $? -ne 0 ]; then [ -n "$MY_BROWSER" ] && echo "Warning: you chose an invalid browser." >&2 #The precise order is up for debate. - for browser in opera skipstone phoenix mozilla galeon konqueror dillo netscape links w3m lynx; do + for browser in firebird opera skipstone phoenix mozilla galeon konqueror dillo netscape links w3m lynx; do if find_it $browser; then DEFAULT_BROWSER=$browser break @@ -682,9 +683,11 @@ append "[exec] (${DEFAULT_TERM}) {${DEFAULT_TERM}}" case "$DEFAULT_BROWSER" in links|w3m|lynx) append "[exec] (${DEFAULT_BROWSER}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;; - mozilla|phoenix|galeon|dillo|netscape) append "[exec] (${DEFAULT_BROWSER}) {${DEFAULT_BROWSER}}" ;; + firebird|mozilla|phoenix|galeon|dillo|netscape) append "[exec] (${DEFAULT_BROWSER}) {${DEFAULT_BROWSER}}" ;; konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;; opera) append "[exec] (opera) {env QT_XFT=true opera}" ;; + MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;; + *) append "[exec] (`basename $DEFAULT_BROWSER`) {$DEFAULT_BROWSER}" ;; esac find_it fbrun append "[exec] (Run) {fbrun}" -- cgit v0.11.2