nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

util/Makefile.am,fluxbox-generate_menu.in: use EXEEXT

Browse source 
Needed to allow mingw-cross-env cross build
This commit is contained in:
Ryan Pavlik 2011-10-28 15:42:18 -05:00
parent 5cb7326d22
commit f77f5d461b
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
util/Makefile.am
View file

@ -36,6 +36,7 @@ startfluxbox: startfluxbox.in
-e "s,@pkgbindir@,$(bindir),g" \ -e "s,@pkgbindir@,$(bindir),g" \
-e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \ -e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \
-e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \ -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \
-e "s,@EXEEXT@,$(EXEEXT),g" \
$(srcdir)/startfluxbox.in > startfluxbox $(srcdir)/startfluxbox.in > startfluxbox
-chmod 755 startfluxbox -chmod 755 startfluxbox
@ -43,6 +44,7 @@ fluxbox-generate_menu: fluxbox-generate_menu.in
@regex_cmd@ -e "s,@PREFIX@,$(prefix),g" \ @regex_cmd@ -e "s,@PREFIX@,$(prefix),g" \
-e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \ -e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \
-e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \ -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \
-e "s,@EXEEXT@,$(EXEEXT),g" \
$(srcdir)/fluxbox-generate_menu.in \ $(srcdir)/fluxbox-generate_menu.in \
> fluxbox-generate_menu > fluxbox-generate_menu
-chmod 755 fluxbox-generate_menu -chmod 755 fluxbox-generate_menu

14
util/fluxbox-generate_menu.in
View file

@ -561,7 +561,7 @@ WHOAMI=`whoami`
[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin [ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
# Check for Imlib2-support # 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" PNG_ICONS="yes"
else else
# better assume to assume "no" # better assume to assume "no"
@ -1252,7 +1252,7 @@ if [ ! "${INSTALL}" = Yes ]; then
# Name of the outputfile # Name of the outputfile
# MENUFILENAME=${USERFLUXDIR}/menu # 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 # standard url for console-browsers
# HOMEPAGE=fluxbox.org # HOMEPAGE=fluxbox.org
@ -1261,7 +1261,7 @@ if [ ! "${INSTALL}" = Yes ]; then
# USERMENU=~/.@pkgprefix@fluxbox@pkgsuffix@/usermenu # USERMENU=~/.@pkgprefix@fluxbox@pkgsuffix@/usermenu
# Put the launcher you would like to use here # Put the launcher you would like to use here
# LAUNCHER=@pkgprefix@fbrun@pkgsuffix@ # LAUNCHER=@pkgprefix@fbrun@pkgsuffix@@EXEEXT@
# LAUNCHER=fbgm # LAUNCHER=fbgm
# Options for fbrun # Options for fbrun
@ -1420,8 +1420,8 @@ fi
# prefix # prefix
PREFIX="${PREFIX:=@PREFIX@}" PREFIX="${PREFIX:=@PREFIX@}"
if [ -z "${PREFIX}" -o ! -d "${PREFIX}" ]; then if [ -z "${PREFIX}" -o ! -d "${PREFIX}" ]; then
hash @pkgprefix@fluxbox@pkgsuffix@ hash @pkgprefix@fluxbox@pkgsuffix@@EXEEXT@
PREFIX=`hash | grep @pkgprefix@fluxbox@pkgsuffix@ | sed 's,.*\t/,/,' | sed 's,/bin/@pkgprefix@fluxbox@pkgsuffix@$,,'` PREFIX=`hash | grep @pkgprefix@fluxbox@pkgsuffix@ | sed 's,.*\t/,/,' | sed 's,/bin/@pkgprefix@fluxbox@pkgsuffix@@EXEEXT@$,,'`
fi fi
@ -1533,7 +1533,7 @@ DEFAULT_BROWSERNAME=`echo $DEFAULT_BROWSER|awk '{print $1}'`
DEFAULT_BROWSERNAME=`basename $DEFAULT_BROWSERNAME` DEFAULT_BROWSERNAME=`basename $DEFAULT_BROWSERNAME`
if [ -z "$LAUNCHER" ]; then if [ -z "$LAUNCHER" ]; then
LAUNCHER=@pkgprefix@fbrun@pkgsuffix@ LAUNCHER=@pkgprefix@fbrun@pkgsuffix@@EXEEXT@
fi fi
if [ -n "$FBRUNOPTIONS" ]; then if [ -n "$FBRUNOPTIONS" ]; then
# with this, LAUNCHER should be renamed LAUNCHER_NAME, but then there's # with this, LAUNCHER should be renamed LAUNCHER_NAME, but then there's
@ -1898,7 +1898,7 @@ append_submenu "${FBSETTINGSMENU}"
append "[commanddialog] (${FLUXBOXCOMMAND})" append "[commanddialog] (${FLUXBOXCOMMAND})"
append "[reconfig] (${RELOADITEM})" append "[reconfig] (${RELOADITEM})"
append "[restart] (${RESTARTITEM})" 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 "[separator]"
append "[exit] (${EXITITEM})" append "[exit] (${EXITITEM})"