diff options
author | Ryan Pavlik <rpavlik@iastate.edu> | 2011-10-28 20:42:18 (GMT) |
---|---|---|
committer | Ryan Pavlik <rpavlik@iastate.edu> | 2011-10-31 15:54:09 (GMT) |
commit | f77f5d461ba22f9e4c2af85c8666501207c163c0 (patch) | |
tree | 0ce2d1d6662fd7fcaa6b344c87ff06f062735bdb /util/fluxbox-generate_menu.in | |
parent | 5cb7326d22e998fbd944a5d71217b61f0e991057 (diff) | |
download | fluxbox-f77f5d461ba22f9e4c2af85c8666501207c163c0.zip fluxbox-f77f5d461ba22f9e4c2af85c8666501207c163c0.tar.bz2 |
util/Makefile.am,fluxbox-generate_menu.in: use EXEEXT
Needed to allow mingw-cross-env cross build
Diffstat (limited to 'util/fluxbox-generate_menu.in')
-rwxr-xr-x | util/fluxbox-generate_menu.in | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in index cecc3fe..63c152e 100755 --- a/util/fluxbox-generate_menu.in +++ b/util/fluxbox-generate_menu.in | |||
@@ -561,7 +561,7 @@ WHOAMI=`whoami` | |||
561 | [ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin | 561 | [ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin |
562 | 562 | ||
563 | # Check for Imlib2-support | 563 | # Check for Imlib2-support |
564 | if @pkgprefix@fluxbox@pkgsuffix@ -info 2> /dev/null | grep -q "^IMLIB"; then | 564 | if @pkgprefix@fluxbox@pkgsuffix@@EXEEXT@ -info 2> /dev/null | grep -q "^IMLIB"; then |
565 | PNG_ICONS="yes" | 565 | PNG_ICONS="yes" |
566 | else | 566 | else |
567 | # better assume to assume "no" | 567 | # better assume to assume "no" |
@@ -1252,7 +1252,7 @@ if [ ! "${INSTALL}" = Yes ]; then | |||
1252 | # Name of the outputfile | 1252 | # Name of the outputfile |
1253 | # MENUFILENAME=${USERFLUXDIR}/menu | 1253 | # MENUFILENAME=${USERFLUXDIR}/menu |
1254 | 1254 | ||
1255 | # MENUTITLE=\`@pkgprefix@fluxbox@pkgsuffix@ -version|cut -d " " -f-2\` | 1255 | # MENUTITLE=\`@pkgprefix@fluxbox@pkgsuffix@@EXEEXT@ -version|cut -d " " -f-2\` |
1256 | 1256 | ||
1257 | # standard url for console-browsers | 1257 | # standard url for console-browsers |
1258 | # HOMEPAGE=fluxbox.org | 1258 | # HOMEPAGE=fluxbox.org |
@@ -1261,7 +1261,7 @@ if [ ! "${INSTALL}" = Yes ]; then | |||
1261 | # USERMENU=~/.@pkgprefix@fluxbox@pkgsuffix@/usermenu | 1261 | # USERMENU=~/.@pkgprefix@fluxbox@pkgsuffix@/usermenu |
1262 | 1262 | ||
1263 | # Put the launcher you would like to use here | 1263 | # Put the launcher you would like to use here |
1264 | # LAUNCHER=@pkgprefix@fbrun@pkgsuffix@ | 1264 | # LAUNCHER=@pkgprefix@fbrun@pkgsuffix@@EXEEXT@ |
1265 | # LAUNCHER=fbgm | 1265 | # LAUNCHER=fbgm |
1266 | 1266 | ||
1267 | # Options for fbrun | 1267 | # Options for fbrun |
@@ -1420,8 +1420,8 @@ fi | |||
1420 | # prefix | 1420 | # prefix |
1421 | PREFIX="${PREFIX:=@PREFIX@}" | 1421 | PREFIX="${PREFIX:=@PREFIX@}" |
1422 | if [ -z "${PREFIX}" -o ! -d "${PREFIX}" ]; then | 1422 | if [ -z "${PREFIX}" -o ! -d "${PREFIX}" ]; then |
1423 | hash @pkgprefix@fluxbox@pkgsuffix@ | 1423 | hash @pkgprefix@fluxbox@pkgsuffix@@EXEEXT@ |
1424 | PREFIX=`hash | grep @pkgprefix@fluxbox@pkgsuffix@ | sed 's,.*\t/,/,' | sed 's,/bin/@pkgprefix@fluxbox@pkgsuffix@$,,'` | 1424 | PREFIX=`hash | grep @pkgprefix@fluxbox@pkgsuffix@ | sed 's,.*\t/,/,' | sed 's,/bin/@pkgprefix@fluxbox@pkgsuffix@@EXEEXT@$,,'` |
1425 | fi | 1425 | fi |
1426 | 1426 | ||
1427 | 1427 | ||
@@ -1533,7 +1533,7 @@ DEFAULT_BROWSERNAME=`echo $DEFAULT_BROWSER|awk '{print $1}'` | |||
1533 | DEFAULT_BROWSERNAME=`basename $DEFAULT_BROWSERNAME` | 1533 | DEFAULT_BROWSERNAME=`basename $DEFAULT_BROWSERNAME` |
1534 | 1534 | ||
1535 | if [ -z "$LAUNCHER" ]; then | 1535 | if [ -z "$LAUNCHER" ]; then |
1536 | LAUNCHER=@pkgprefix@fbrun@pkgsuffix@ | 1536 | LAUNCHER=@pkgprefix@fbrun@pkgsuffix@@EXEEXT@ |
1537 | fi | 1537 | fi |
1538 | if [ -n "$FBRUNOPTIONS" ]; then | 1538 | if [ -n "$FBRUNOPTIONS" ]; then |
1539 | # with this, LAUNCHER should be renamed LAUNCHER_NAME, but then there's | 1539 | # with this, LAUNCHER should be renamed LAUNCHER_NAME, but then there's |
@@ -1898,7 +1898,7 @@ append_submenu "${FBSETTINGSMENU}" | |||
1898 | append "[commanddialog] (${FLUXBOXCOMMAND})" | 1898 | append "[commanddialog] (${FLUXBOXCOMMAND})" |
1899 | append "[reconfig] (${RELOADITEM})" | 1899 | append "[reconfig] (${RELOADITEM})" |
1900 | append "[restart] (${RESTARTITEM})" | 1900 | append "[restart] (${RESTARTITEM})" |
1901 | append "[exec] (${ABOUTITEM}) {(@pkgprefix@fluxbox@pkgsuffix@ -v; @pkgprefix@fluxbox@pkgsuffix@ -info | sed 1d) | $XMESSAGE -file - -center}" | 1901 | append "[exec] (${ABOUTITEM}) {(@pkgprefix@fluxbox@pkgsuffix@@EXEEXT@ -v; @pkgprefix@fluxbox@pkgsuffix@@EXEEXT@ -info | sed 1d) | $XMESSAGE -file - -center}" |
1902 | append "[separator]" | 1902 | append "[separator]" |
1903 | append "[exit] (${EXITITEM})" | 1903 | append "[exit] (${EXITITEM})" |
1904 | 1904 | ||