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
                             -e "s,@pkgbindir@,$(bindir),g" \
                             -e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \
                             -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \
+                            -e "s,@EXEEXT@,$(EXEEXT),g" \
                                 $(srcdir)/startfluxbox.in > startfluxbox
                 -chmod 755 startfluxbox
 
@@ -43,6 +44,7 @@ fluxbox-generate_menu: fluxbox-generate_menu.in
                 @regex_cmd@ -e "s,@PREFIX@,$(prefix),g" \
                             -e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \
                             -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \
+                            -e "s,@EXEEXT@,$(EXEEXT),g" \
                                 $(srcdir)/fluxbox-generate_menu.in \
                                 > fluxbox-generate_menu
                 -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`
 [ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
 
 # Check for Imlib2-support
-if @pkgprefix@fluxbox@pkgsuffix@ -info 2> /dev/null | grep -q "^IMLIB"; then
+if @pkgprefix@fluxbox@pkgsuffix@@EXEEXT@ -info 2> /dev/null | grep -q "^IMLIB"; then
     PNG_ICONS="yes"
 else
     # better assume to assume "no"
@@ -1252,7 +1252,7 @@ if [ ! "${INSTALL}" = Yes ]; then
 # Name of the outputfile
 # MENUFILENAME=${USERFLUXDIR}/menu
 
-# MENUTITLE=\`@pkgprefix@fluxbox@pkgsuffix@ -version|cut -d " " -f-2\`
+# MENUTITLE=\`@pkgprefix@fluxbox@pkgsuffix@@EXEEXT@ -version|cut -d " " -f-2\`
 
 # standard url for console-browsers
 # HOMEPAGE=fluxbox.org
@@ -1261,7 +1261,7 @@ if [ ! "${INSTALL}" = Yes ]; then
 # USERMENU=~/.@pkgprefix@fluxbox@pkgsuffix@/usermenu
 
 # Put the launcher you would like to use here
-# LAUNCHER=@pkgprefix@fbrun@pkgsuffix@
+# LAUNCHER=@pkgprefix@fbrun@pkgsuffix@@EXEEXT@
 # LAUNCHER=fbgm
 
 # Options for fbrun
@@ -1420,8 +1420,8 @@ fi
 # prefix
 PREFIX="${PREFIX:=@PREFIX@}"
 if [  -z "${PREFIX}" -o ! -d "${PREFIX}" ]; then
-    hash @pkgprefix@fluxbox@pkgsuffix@
-    PREFIX=`hash | grep @pkgprefix@fluxbox@pkgsuffix@ | sed 's,.*\t/,/,' | sed 's,/bin/@pkgprefix@fluxbox@pkgsuffix@$,,'`
+    hash @pkgprefix@fluxbox@pkgsuffix@@EXEEXT@
+    PREFIX=`hash | grep @pkgprefix@fluxbox@pkgsuffix@ | sed 's,.*\t/,/,' | sed 's,/bin/@pkgprefix@fluxbox@pkgsuffix@@EXEEXT@$,,'`
 fi
 
 
@@ -1533,7 +1533,7 @@ DEFAULT_BROWSERNAME=`echo $DEFAULT_BROWSER|awk '{print $1}'`
 DEFAULT_BROWSERNAME=`basename $DEFAULT_BROWSERNAME`
 
 if [ -z "$LAUNCHER" ]; then
-    LAUNCHER=@pkgprefix@fbrun@pkgsuffix@
+    LAUNCHER=@pkgprefix@fbrun@pkgsuffix@@EXEEXT@
 fi
 if [ -n "$FBRUNOPTIONS" ]; then
     # with this, LAUNCHER should be renamed LAUNCHER_NAME, but then there's
@@ -1898,7 +1898,7 @@ append_submenu "${FBSETTINGSMENU}"
     append "[commanddialog] (${FLUXBOXCOMMAND})"
     append "[reconfig] (${RELOADITEM})"
     append "[restart] (${RESTARTITEM})"
-    append "[exec] (${ABOUTITEM}) {(@pkgprefix@fluxbox@pkgsuffix@ -v; @pkgprefix@fluxbox@pkgsuffix@ -info | sed 1d) | $XMESSAGE -file - -center}"
+    append "[exec] (${ABOUTITEM}) {(@pkgprefix@fluxbox@pkgsuffix@@EXEEXT@ -v; @pkgprefix@fluxbox@pkgsuffix@@EXEEXT@ -info | sed 1d) | $XMESSAGE -file - -center}"
     append "[separator]"
     append "[exit] (${EXITITEM})"