with menu, style, keys, init options, thanks php-coder

author: fluxgen <fluxgen> 2005-03-16 08:42:18 (GMT)
committer: fluxgen <fluxgen> 2005-03-16 08:42:18 (GMT)
commit: 68708a89cbcbfef67c671b84ffd9f53b4eb054df (patch)
tree: 5c932a0272a643ab2cb418d2dbccc27a5d763c23
parent: fa930f7edff01672b729c660f7d7679c2aa83f45 (diff)
download: fluxbox-68708a89cbcbfef67c671b84ffd9f53b4eb054df.zip
fluxbox-68708a89cbcbfef67c671b84ffd9f53b4eb054df.tar.bz2
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 243cb1d..eb81f3d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,10 +24,10 @@
 SUBDIRS= FbTk
-DEFAULT_MENU=$(pkgdatadir)/menu
+DEFAULT_MENU=@DEFAULT_MENU@
 DEFAULT_STYLE=$(pkgdatadir)/styles/Clean
-DEFAULT_KEYSFILE=$(pkgdatadir)/keys
+DEFAULT_KEYSFILE=@DEFAULT_KEYS@
-DEFAULT_INITFILE=
+DEFAULT_INITFILE=@DEFAULT_INIT@
 AM_CPPFLAGS=@CPPFLAGS@ -I$(srcdir)/FbTk
@@ -39,7 +39,7 @@ defaults.hh: Makefile
        echo '#define DEFAULTMENU "$(DEFAULT_MENU)"' >> defaults.hh
        echo '#define DEFAULTSTYLE "$(DEFAULT_STYLE)"' >> defaults.hh
        echo '#define DEFAULTKEYSFILE "$(DEFAULT_KEYSFILE)"' >> defaults.hh
-        echo '#define DEFAULT_INITFILE "$(pkgdatadir)/init"' >> defaults.hh
+        echo '#define DEFAULT_INITFILE "$(DEFAULT_INITFILE)"' >> defaults.hh
        echo '#define LOCALEPATH "$(pkgdatadir)/nls"' >> defaults.hh
        echo 'const char* svnversion(void);' >> defaults.hh
author	fluxgen <fluxgen>	2005-03-16 08:42:18 (GMT)
committer	fluxgen <fluxgen>	2005-03-16 08:42:18 (GMT)
commit	68708a89cbcbfef67c671b84ffd9f53b4eb054df (patch)
tree	5c932a0272a643ab2cb418d2dbccc27a5d763c23
parent	fa930f7edff01672b729c660f7d7679c2aa83f45 (diff)
download	fluxbox-68708a89cbcbfef67c671b84ffd9f53b4eb054df.zip fluxbox-68708a89cbcbfef67c671b84ffd9f53b4eb054df.tar.bz2

diff --git a/src/Makefile.am b/src/Makefile.am index 243cb1d..eb81f3d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am
@@ -24,10 +24,10 @@
24		24
25		25
26	SUBDIRS= FbTk	26	SUBDIRS= FbTk
27	DEFAULT_MENU=$(pkgdatadir)/menu	27	DEFAULT_MENU=@DEFAULT_MENU@
28	DEFAULT_STYLE=$(pkgdatadir)/styles/Clean	28	DEFAULT_STYLE=$(pkgdatadir)/styles/Clean
29	DEFAULT_KEYSFILE=$(pkgdatadir)/keys	29	DEFAULT_KEYSFILE=@DEFAULT_KEYS@
30	DEFAULT_INITFILE=	30	DEFAULT_INITFILE=@DEFAULT_INIT@
31		31
32	AM_CPPFLAGS=@CPPFLAGS@ -I$(srcdir)/FbTk	32	AM_CPPFLAGS=@CPPFLAGS@ -I$(srcdir)/FbTk
33		33
@@ -39,7 +39,7 @@ defaults.hh: Makefile
39	echo '#define DEFAULTMENU "$(DEFAULT_MENU)"' >> defaults.hh	39	echo '#define DEFAULTMENU "$(DEFAULT_MENU)"' >> defaults.hh
40	echo '#define DEFAULTSTYLE "$(DEFAULT_STYLE)"' >> defaults.hh	40	echo '#define DEFAULTSTYLE "$(DEFAULT_STYLE)"' >> defaults.hh
41	echo '#define DEFAULTKEYSFILE "$(DEFAULT_KEYSFILE)"' >> defaults.hh	41	echo '#define DEFAULTKEYSFILE "$(DEFAULT_KEYSFILE)"' >> defaults.hh
42	echo '#define DEFAULT_INITFILE "$(pkgdatadir)/init"' >> defaults.hh	42	echo '#define DEFAULT_INITFILE "$(DEFAULT_INITFILE)"' >> defaults.hh
43	echo '#define LOCALEPATH "$(pkgdatadir)/nls"' >> defaults.hh	43	echo '#define LOCALEPATH "$(pkgdatadir)/nls"' >> defaults.hh
44	echo 'const char* svnversion(void);' >> defaults.hh	44	echo 'const char* svnversion(void);' >> defaults.hh
45		45