From e30f235daf6993631a0a3ec32cce1e16ec791441 Mon Sep 17 00:00:00 2001 From: markt <markt> Date: Fri, 23 Nov 2007 23:21:25 +0000 Subject: fix from NetBSD for using the home directory of the user who compiled fluxbox also fix 'regenerate menu' code to use correct program name, rather than $0 --- util/fluxbox-generate_menu.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in index 54938be..a585170 100755 --- a/util/fluxbox-generate_menu.in +++ b/util/fluxbox-generate_menu.in @@ -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}" -- cgit v0.11.2