summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsimonb <simonb>2007-03-31 11:28:46 (GMT)
committersimonb <simonb>2007-03-31 11:28:46 (GMT)
commit383f99d4b6a90a5be3c4b8ea9a32fb902f3220cc (patch)
treeb7de457bcf6000b2eddae35a07413d9b25b88eeb
parent9ce423ab5f6d7f55d61d8c931d1a4d30cfd07da3 (diff)
downloadfluxbox_lack-383f99d4b6a90a5be3c4b8ea9a32fb902f3220cc.zip
fluxbox_lack-383f99d4b6a90a5be3c4b8ea9a32fb902f3220cc.tar.bz2
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
-rw-r--r--ChangeLog3
-rw-r--r--Makefile.am5
-rw-r--r--data/Makefile.am1
-rwxr-xr-xutil/fluxbox-generate_menu.in3
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 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0.0: 2Changes for 1.0.0:
3*07/03/31: 3*07/03/31:
4 * Default value for $LAUNCHER, plus add util and util/fbrun to the
5 PATH when generating install menu so it can find fbrun (Simon)
6 fluxbox-generate_menu.in Makefile.am data/Makefile.am
4 * Make fluxbox-generate_menu emit [encoding] tags around all of its 7 * Make fluxbox-generate_menu emit [encoding] tags around all of its
5 menus. Please check that it is the right encoding, I had to guess 8 menus. Please check that it is the right encoding, I had to guess
6 some as it wasn't recorded (Simon) 9 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 @@
1# Makefile.am for Fluxbox - http://fluxbox.org 1# Makefile.am for Fluxbox - http://fluxbox.org
2 2
3SUBDIRS = data doc nls src util 3# data dir after util so that utils are built for path searching
4# when generating menu
5
6SUBDIRS = doc nls src util data
4MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in 7MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in
5ACLOCAL_AMFLAGS = -I . 8ACLOCAL_AMFLAGS = -I .
6EXTRA_DIST = acinclude.m4 9EXTRA_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
33 PREFIX="${prefix}" \ 33 PREFIX="${prefix}" \
34 MENUTITLE="Fluxbox-${VERSION}" \ 34 MENUTITLE="Fluxbox-${VERSION}" \
35 INSTALL=Yes \ 35 INSTALL=Yes \
36 PATH="${PATH}:../util:../util/fbrun" \
36 ../util/fluxbox-generate_menu 37 ../util/fluxbox-generate_menu
37 38
38../util/fluxbox-generate_menu: 39../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
1529DEFAULT_BROWSERNAME=`echo $DEFAULT_BROWSER|awk '{print $1}'` 1529DEFAULT_BROWSERNAME=`echo $DEFAULT_BROWSER|awk '{print $1}'`
1530DEFAULT_BROWSERNAME=`basename $DEFAULT_BROWSERNAME` 1530DEFAULT_BROWSERNAME=`basename $DEFAULT_BROWSERNAME`
1531 1531
1532if [ -z "$LAUNCHER" ]; then
1533 LAUNCHER=fbrun
1534fi
1532 1535
1533# Start of menu 1536# Start of menu
1534cat << EOF > ${MENUFILENAME} 1537cat << EOF > ${MENUFILENAME}