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

fix from NetBSD for using the home directory of the user who compiled fluxbox

Browse source 
also fix 'regenerate menu' code to use correct program name, rather than $0
This commit is contained in:
markt 2007-11-23 23:21:25 +00:00
parent 9ed25584a1
commit e30f235daf
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
util/fluxbox-generate_menu.in
View file

@ -1210,7 +1210,7 @@ case ${LC_ALL} in
esac
# Set Defaults
USERFLUXDIR="${HOME}/.@pkgprefix@fluxbox@pkgsuffix@"
USERFLUXDIR="\${HOME}/.@pkgprefix@fluxbox@pkgsuffix@"
MENUFILENAME="${MENUFILENAME:=${USERFLUXDIR}/menu}"
MENUTITLE="${MENUTITLE:=Fluxbox}"
HOMEPAGE="${HOMEPAGE:=fluxbox.org}"
@ -1708,7 +1708,7 @@ append_submenu "${MULTIMEDIAMENU}"
append_submenu "${XUTILSMENU}"
normal_find xfontsel xman xload xbiff editres viewres xclock \
xmag wmagnify gkrellm gkrellm2 vmware portagemaster agave
find_it xrdb append "[exec] (Reload .Xdefaults) {xrdb -load $HOME/.Xdefaults}"
find_it xrdb append "[exec] (Reload .Xdefaults) {xrdb -load \$HOME/.Xdefaults}"
append_menu_end
append_menu_end
@ -1879,7 +1879,7 @@ append_submenu "${FBSETTINGSMENU}"
find_it ${LAUNCHER} append "[exec] (${RUNCOMMAND}) {${LAUNCHER} $FBRUNOPTIONS}"
find_it switch append "[exec] (gtk-theme-switch) {switch}"
find_it switch2 append "[exec] (gtk2-theme-switch) {switch2}"
find_it $0 append "[exec] (${REGENERATEMENU}) {$0 ${BACKUPOPTIONS}}"
find_it $0 append "[exec] (${REGENERATEMENU}) {@pkgprefix@fluxbox-generate_menu@pkgsuffix@ ${BACKUPOPTIONS}}"
append_menu_end
append_submenu "${WINDOWMANAGERS}"