aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Pavlik <rpavlik@iastate.edu>2011-10-28 20:42:18 (GMT)
committerRyan Pavlik <rpavlik@iastate.edu>2011-10-31 15:54:09 (GMT)
commitf77f5d461ba22f9e4c2af85c8666501207c163c0 (patch)
tree0ce2d1d6662fd7fcaa6b344c87ff06f062735bdb
parent5cb7326d22e998fbd944a5d71217b61f0e991057 (diff)
downloadfluxbox_paul-f77f5d461ba22f9e4c2af85c8666501207c163c0.zip
fluxbox_paul-f77f5d461ba22f9e4c2af85c8666501207c163c0.tar.bz2
util/Makefile.am,fluxbox-generate_menu.in: use EXEEXT
Needed to allow mingw-cross-env cross build
-rw-r--r--util/Makefile.am2
-rwxr-xr-xutil/fluxbox-generate_menu.in14
2 files changed, 9 insertions, 7 deletions
diff --git a/util/Makefile.am b/util/Makefile.am
index d0895ae..e33dd30 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -36,6 +36,7 @@ startfluxbox: startfluxbox.in
36 -e "s,@pkgbindir@,$(bindir),g" \ 36 -e "s,@pkgbindir@,$(bindir),g" \
37 -e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \ 37 -e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \
38 -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \ 38 -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \
39 -e "s,@EXEEXT@,$(EXEEXT),g" \
39 $(srcdir)/startfluxbox.in > startfluxbox 40 $(srcdir)/startfluxbox.in > startfluxbox
40 -chmod 755 startfluxbox 41 -chmod 755 startfluxbox
41 42
@@ -43,6 +44,7 @@ fluxbox-generate_menu: fluxbox-generate_menu.in
43 @regex_cmd@ -e "s,@PREFIX@,$(prefix),g" \ 44 @regex_cmd@ -e "s,@PREFIX@,$(prefix),g" \
44 -e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \ 45 -e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \
45 -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \ 46 -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \
47 -e "s,@EXEEXT@,$(EXEEXT),g" \
46 $(srcdir)/fluxbox-generate_menu.in \ 48 $(srcdir)/fluxbox-generate_menu.in \
47 > fluxbox-generate_menu 49 > fluxbox-generate_menu
48 -chmod 755 fluxbox-generate_menu 50 -chmod 755 fluxbox-generate_menu
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
564if @pkgprefix@fluxbox@pkgsuffix@ -info 2> /dev/null | grep -q "^IMLIB"; then 564if @pkgprefix@fluxbox@pkgsuffix@@EXEEXT@ -info 2> /dev/null | grep -q "^IMLIB"; then
565 PNG_ICONS="yes" 565 PNG_ICONS="yes"
566else 566else
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
1421PREFIX="${PREFIX:=@PREFIX@}" 1421PREFIX="${PREFIX:=@PREFIX@}"
1422if [ -z "${PREFIX}" -o ! -d "${PREFIX}" ]; then 1422if [ -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@$,,'`
1425fi 1425fi
1426 1426
1427 1427
@@ -1533,7 +1533,7 @@ DEFAULT_BROWSERNAME=`echo $DEFAULT_BROWSER|awk '{print $1}'`
1533DEFAULT_BROWSERNAME=`basename $DEFAULT_BROWSERNAME` 1533DEFAULT_BROWSERNAME=`basename $DEFAULT_BROWSERNAME`
1534 1534
1535if [ -z "$LAUNCHER" ]; then 1535if [ -z "$LAUNCHER" ]; then
1536 LAUNCHER=@pkgprefix@fbrun@pkgsuffix@ 1536 LAUNCHER=@pkgprefix@fbrun@pkgsuffix@@EXEEXT@
1537fi 1537fi
1538if [ -n "$FBRUNOPTIONS" ]; then 1538if [ -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