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

4 files changed, 11 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 72ed493..5958735 100644
--- a/ChangeLog
+++ b/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)
diff --git a/Makefile.am b/Makefile.am
index 1c024a8..dd194fd 100644
--- a/Makefile.am
+++ b/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
diff --git a/data/Makefile.am b/data/Makefile.am
index 2a99ce4..0402551 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -33,6 +33,7 @@ menu: 			../util/fluxbox-generate_menu
                 PREFIX="${prefix}" \
                 MENUTITLE="Fluxbox-${VERSION}" \
                 INSTALL=Yes \
+                PATH="${PATH}:../util:../util/fbrun" \
                 ../util/fluxbox-generate_menu
 
 ../util/fluxbox-generate_menu:
diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
index c512216..7c89f7e 100755
--- a/util/fluxbox-generate_menu.in
+++ b/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}