From 6afde5c5201f69c41ea2ebf6db4e76507ce10ba1 Mon Sep 17 00:00:00 2001
From: mathias <mathias>
Date: Wed, 12 Jan 2005 06:19:25 +0000
Subject: added --with-style=<path-to-style> option for ./configure, patch from
 php-coder

---
 data/Makefile.am | 5 ++++-
 data/init.in     | 2 +-
 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 @@
 # data/Makefile.am for Fluxbox - an X11 Window manager
 
+DEFAULT _STYLE = @DEFAULT_STYLE@
+
 SUBDIRS= 		styles
 CLEANFILES= 		menu menu.in menu.pre menu.bak init
 MAINTAINERCLEANFILES= 	Makefile.in
@@ -9,7 +11,8 @@ all-local: 		menu init
 distclean-local:
 		rm -f *\~
 init: 			init.in
-	@regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" $(srcdir)/init.in > init
+	@regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \
+			-e "s,@default_style@,$(DEFAULT_STYLE),g" $(srcdir)/init.in > init
 
 menu: 			../util/fluxbox-generate_menu
 	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
 session.autoRaiseDelay:	250
 session.menuFile:	~/.fluxbox/menu
 session.cacheLife:	5
-session.styleFile:	@pkgdatadir@/styles/Meta
+session.styleFile:	@default_style@
 session.keyFile: ~/.fluxbox/keys
 session.colorsPerChannel:	4
 session.doubleClickInterval:	250
-- 
cgit v0.11.2