small changes from fbsd

3 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index cd3687f..0f249a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 (Format: Year/Month/Day)
 Changes for 0.9.15:
+*05/10/12:
+   * Small changes, coming from fbsd-ports (thanx Jeremy Messenger <mezz at FreeBSD dot org>)
+     util/fluxbox-generate_menu.in util/startfluxbox.in
 *05/10/04:
    * Avoid drawing the resize outline if not really resizing (Mathias)
      Window.cc
diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
index 9fcdc21..4c2e863 100755
--- a/util/fluxbox-generate_menu.in
+++ b/util/fluxbox-generate_menu.in
@@ -1166,8 +1166,8 @@ if [ ! "${INSTALL}" = Yes ]; then
 # FBRUNOPTIONS='-font 10x20 -fg grey -bg black -title run'
 
 # --- PREFIX'es
-# These are prefixes; So if fluxbox is installed in /usr/bin/fluxbox
-# your prefix is: /usr
+# These are prefixes; So if fluxbox is installed in @PREFIX@/bin/fluxbox
+# your prefix is: @PREFIX@
 
 # fluxbox-generate already looks in /usr/X11R6, /usr, /usr/local and /opt so
 # there should be no need to specify them.
diff --git a/util/startfluxbox.in b/util/startfluxbox.in
index 154ccdb..920fb5e 100755
--- a/util/startfluxbox.in
+++ b/util/startfluxbox.in
@@ -29,7 +29,7 @@ elif [ -r "$startup" ]; then
     exec sh "$startup"
 else
     if [ ! -d ~/.fluxbox ]; then
-        mkdir -p ~/.fluxbox/{backgrounds,styles,pixmaps}
+        mkdir -p ~/.fluxbox/backgrounds ~/.fluxbox/styles ~/.fluxbox/pixmaps
     fi
     if [ ! -r "$startup" ]; then
         ( cat << EOF