summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2007-11-23 23:21:25 (GMT)
committermarkt <markt>2007-11-23 23:21:25 (GMT)
commite30f235daf6993631a0a3ec32cce1e16ec791441 (patch)
treeffe4418dd14e5f88e4c5f430c29d7b4f213f4f1e
parent9ed25584a17269efe85e63fe560bf00c495258c1 (diff)
downloadfluxbox_lack-e30f235daf6993631a0a3ec32cce1e16ec791441.zip
fluxbox_lack-e30f235daf6993631a0a3ec32cce1e16ec791441.tar.bz2
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
-rwxr-xr-xutil/fluxbox-generate_menu.in6
1 files 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
1210esac 1210esac
1211 1211
1212# Set Defaults 1212# Set Defaults
1213USERFLUXDIR="${HOME}/.@pkgprefix@fluxbox@pkgsuffix@" 1213USERFLUXDIR="\${HOME}/.@pkgprefix@fluxbox@pkgsuffix@"
1214MENUFILENAME="${MENUFILENAME:=${USERFLUXDIR}/menu}" 1214MENUFILENAME="${MENUFILENAME:=${USERFLUXDIR}/menu}"
1215MENUTITLE="${MENUTITLE:=Fluxbox}" 1215MENUTITLE="${MENUTITLE:=Fluxbox}"
1216HOMEPAGE="${HOMEPAGE:=fluxbox.org}" 1216HOMEPAGE="${HOMEPAGE:=fluxbox.org}"
@@ -1708,7 +1708,7 @@ append_submenu "${MULTIMEDIAMENU}"
1708 append_submenu "${XUTILSMENU}" 1708 append_submenu "${XUTILSMENU}"
1709 normal_find xfontsel xman xload xbiff editres viewres xclock \ 1709 normal_find xfontsel xman xload xbiff editres viewres xclock \
1710 xmag wmagnify gkrellm gkrellm2 vmware portagemaster agave 1710 xmag wmagnify gkrellm gkrellm2 vmware portagemaster agave
1711 find_it xrdb append "[exec] (Reload .Xdefaults) {xrdb -load $HOME/.Xdefaults}" 1711 find_it xrdb append "[exec] (Reload .Xdefaults) {xrdb -load \$HOME/.Xdefaults}"
1712 append_menu_end 1712 append_menu_end
1713append_menu_end 1713append_menu_end
1714 1714
@@ -1879,7 +1879,7 @@ append_submenu "${FBSETTINGSMENU}"
1879 find_it ${LAUNCHER} append "[exec] (${RUNCOMMAND}) {${LAUNCHER} $FBRUNOPTIONS}" 1879 find_it ${LAUNCHER} append "[exec] (${RUNCOMMAND}) {${LAUNCHER} $FBRUNOPTIONS}"
1880 find_it switch append "[exec] (gtk-theme-switch) {switch}" 1880 find_it switch append "[exec] (gtk-theme-switch) {switch}"
1881 find_it switch2 append "[exec] (gtk2-theme-switch) {switch2}" 1881 find_it switch2 append "[exec] (gtk2-theme-switch) {switch2}"
1882 find_it $0 append "[exec] (${REGENERATEMENU}) {$0 ${BACKUPOPTIONS}}" 1882 find_it $0 append "[exec] (${REGENERATEMENU}) {@pkgprefix@fluxbox-generate_menu@pkgsuffix@ ${BACKUPOPTIONS}}"
1883 append_menu_end 1883 append_menu_end
1884 1884
1885 append_submenu "${WINDOWMANAGERS}" 1885 append_submenu "${WINDOWMANAGERS}"