all repos — fluxbox @ 383f99d4b6a90a5be3c4b8ea9a32fb902f3220cc

custom fork of the fluxbox windowmanager 

Default value for $LAUNCHER, plus add util and util/fbrun to the 
PATH when generating install menu so it can find fbrun.
data thus needs to come after util in toplevel subdir processing so
that fbrun is built
simonb simonb
commit

383f99d4b6a90a5be3c4b8ea9a32fb902f3220cc

parent

9ce423ab5f6d7f55d61d8c931d1a4d30cfd07da3

4 files changed, 11 insertions(+), 1 deletions(-)

jump to
M ChangeLog → ChangeLog 
@@ -1,6 +1,9 @@
  (Format: Year/Month/Day)
 Changes for 1.0.0:
 *07/03/31:
+   * Default value for $LAUNCHER, plus add util and util/fbrun to the 
+     PATH when generating install menu so it can find fbrun (Simon)
+     fluxbox-generate_menu.in Makefile.am data/Makefile.am
    * Make fluxbox-generate_menu emit [encoding] tags around all of its
      menus. Please check that it is the right encoding, I had to guess
      some as it wasn't recorded (Simon)
M Makefile.am → Makefile.am 
@@ -1,6 +1,9 @@
 # Makefile.am for Fluxbox - http://fluxbox.org
 
-SUBDIRS = data doc nls src util
+# data dir after util so that utils are built for path searching
+# when generating menu
+
+SUBDIRS = doc nls src util data
 MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in
 ACLOCAL_AMFLAGS = -I .
 EXTRA_DIST = acinclude.m4
M data/Makefile.am → data/Makefile.am 
@@ -33,6 +33,7 @@ env	MENUFILENAME=menu \
 		PREFIX="${prefix}" \
 		MENUTITLE="Fluxbox-${VERSION}" \
 		INSTALL=Yes \
+		PATH="${PATH}:../util:../util/fbrun" \
 		../util/fluxbox-generate_menu
 
 ../util/fluxbox-generate_menu:
M util/fluxbox-generate_menu.in → util/fluxbox-generate_menu.in 
@@ -1529,6 +1529,9 @@ fi
 DEFAULT_BROWSERNAME=`echo $DEFAULT_BROWSER|awk '{print $1}'`
 DEFAULT_BROWSERNAME=`basename $DEFAULT_BROWSERNAME`
 
+if [ -z "$LAUNCHER" ]; then
+    LAUNCHER=fbrun
+fi
 
 # Start of menu
 cat << EOF > ${MENUFILENAME}