summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathias <mathias>2005-01-12 06:19:25 (GMT)
committermathias <mathias>2005-01-12 06:19:25 (GMT)
commit6afde5c5201f69c41ea2ebf6db4e76507ce10ba1 (patch)
tree355ea507ed7a0b77e12a45a3f00f09f8cbcfa06a
parent11fa3b8585e706fd0d15f1f064d13eda4956c550 (diff)
downloadfluxbox_lack-6afde5c5201f69c41ea2ebf6db4e76507ce10ba1.zip
fluxbox_lack-6afde5c5201f69c41ea2ebf6db4e76507ce10ba1.tar.bz2
added --with-style=<path-to-style> option for ./configure, patch from php-coder
-rw-r--r--data/Makefile.am5
-rw-r--r--data/init.in2
2 files changed, 5 insertions, 2 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index f9426a3..92ded44 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,7 @@
1# data/Makefile.am for Fluxbox - an X11 Window manager 1# data/Makefile.am for Fluxbox - an X11 Window manager
2 2
3DEFAULT _STYLE = @DEFAULT_STYLE@
4
3SUBDIRS= styles 5SUBDIRS= styles
4CLEANFILES= menu menu.in menu.pre menu.bak init 6CLEANFILES= menu menu.in menu.pre menu.bak init
5MAINTAINERCLEANFILES= Makefile.in 7MAINTAINERCLEANFILES= Makefile.in
@@ -9,7 +11,8 @@ all-local: menu init
9distclean-local: 11distclean-local:
10 rm -f *\~ 12 rm -f *\~
11init: init.in 13init: init.in
12 @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" $(srcdir)/init.in > init 14 @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \
15 -e "s,@default_style@,$(DEFAULT_STYLE),g" $(srcdir)/init.in > init
13 16
14menu: ../util/fluxbox-generate_menu 17menu: ../util/fluxbox-generate_menu
15 env MENUFILENAME=menu \ 18 env MENUFILENAME=menu \
diff --git a/data/init.in b/data/init.in
index e97f46d..87ae37f 100644
--- a/data/init.in
+++ b/data/init.in
@@ -27,7 +27,7 @@ session.opaqueMove: False
27session.autoRaiseDelay: 250 27session.autoRaiseDelay: 250
28session.menuFile: ~/.fluxbox/menu 28session.menuFile: ~/.fluxbox/menu
29session.cacheLife: 5 29session.cacheLife: 5
30session.styleFile: @pkgdatadir@/styles/Meta 30session.styleFile: @default_style@
31session.keyFile: ~/.fluxbox/keys 31session.keyFile: ~/.fluxbox/keys
32session.colorsPerChannel: 4 32session.colorsPerChannel: 4
33session.doubleClickInterval: 250 33session.doubleClickInterval: 250