summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathias <mathias>2005-10-12 20:59:12 (GMT)
committermathias <mathias>2005-10-12 20:59:12 (GMT)
commit499b0655b917241314279acceb9a86bc975ab077 (patch)
tree5027b690859afec36a53b801caac5f92722da400
parent42afb461691ab184263606d93809d0a11e5b8600 (diff)
downloadfluxbox_lack-499b0655b917241314279acceb9a86bc975ab077.zip
fluxbox_lack-499b0655b917241314279acceb9a86bc975ab077.tar.bz2
small changes from fbsd
-rw-r--r--ChangeLog3
-rwxr-xr-xutil/fluxbox-generate_menu.in4
-rwxr-xr-xutil/startfluxbox.in2
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 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.15: 2Changes for 0.9.15:
3*05/10/12:
4 * Small changes, coming from fbsd-ports (thanx Jeremy Messenger <mezz at FreeBSD dot org>)
5 util/fluxbox-generate_menu.in util/startfluxbox.in
3*05/10/04: 6*05/10/04:
4 * Avoid drawing the resize outline if not really resizing (Mathias) 7 * Avoid drawing the resize outline if not really resizing (Mathias)
5 Window.cc 8 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
1166# FBRUNOPTIONS='-font 10x20 -fg grey -bg black -title run' 1166# FBRUNOPTIONS='-font 10x20 -fg grey -bg black -title run'
1167 1167
1168# --- PREFIX'es 1168# --- PREFIX'es
1169# These are prefixes; So if fluxbox is installed in /usr/bin/fluxbox 1169# These are prefixes; So if fluxbox is installed in @PREFIX@/bin/fluxbox
1170# your prefix is: /usr 1170# your prefix is: @PREFIX@
1171 1171
1172# fluxbox-generate already looks in /usr/X11R6, /usr, /usr/local and /opt so 1172# fluxbox-generate already looks in /usr/X11R6, /usr, /usr/local and /opt so
1173# there should be no need to specify them. 1173# 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
29 exec sh "$startup" 29 exec sh "$startup"
30else 30else
31 if [ ! -d ~/.fluxbox ]; then 31 if [ ! -d ~/.fluxbox ]; then
32 mkdir -p ~/.fluxbox/{backgrounds,styles,pixmaps} 32 mkdir -p ~/.fluxbox/backgrounds ~/.fluxbox/styles ~/.fluxbox/pixmaps
33 fi 33 fi
34 if [ ! -r "$startup" ]; then 34 if [ ! -r "$startup" ]; then
35 ( cat << EOF 35 ( cat << EOF