aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authormarkt <markt>2007-07-07 23:11:04 (GMT)
committermarkt <markt>2007-07-07 23:11:04 (GMT)
commit135019abf97c7adb236c061d46e3906e51c8a145 (patch)
tree2e675ac4d9dfda48301e0b2a40b057448174692e /src/Makefile.am
parentb735d405f58ac226e025d6ef4dbd91a0129bb12e (diff)
downloadfluxbox_pavel-135019abf97c7adb236c061d46e3906e51c8a145.zip
fluxbox_pavel-135019abf97c7adb236c061d46e3906e51c8a145.tar.bz2
fixes for --program-prefix and --program-suffix, plus fixed overwriting init file on reconfigure
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 5b74800..b6cb024 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,6 +28,8 @@ DEFAULT_MENU=@DEFAULT_MENU@
28DEFAULT_STYLE=$(pkgdatadir)/styles/Clean 28DEFAULT_STYLE=$(pkgdatadir)/styles/Clean
29DEFAULT_KEYSFILE=@DEFAULT_KEYS@ 29DEFAULT_KEYSFILE=@DEFAULT_KEYS@
30DEFAULT_INITFILE=@DEFAULT_INIT@ 30DEFAULT_INITFILE=@DEFAULT_INIT@
31PROGRAM_PREFIX=@program_prefix@
32PROGRAM_SUFFIX=@program_suffix@
31 33
32AM_CPPFLAGS=-I$(srcdir)/FbTk 34AM_CPPFLAGS=-I$(srcdir)/FbTk
33 35
@@ -37,14 +39,25 @@ CONFIG_CLEAN_FILES = defaults.hh
37defaults.hh: Makefile 39defaults.hh: Makefile
38 @( \ 40 @( \
39 echo '// This file is generated from Makefile. Do not edit!'; \ 41 echo '// This file is generated from Makefile. Do not edit!'; \
42 echo '#include <string>'; \
43 echo ''; \
40 echo '#define DEFAULTMENU "$(DEFAULT_MENU)"'; \ 44 echo '#define DEFAULTMENU "$(DEFAULT_MENU)"'; \
41 echo '#define DEFAULTSTYLE "$(DEFAULT_STYLE)"'; \ 45 echo '#define DEFAULTSTYLE "$(DEFAULT_STYLE)"'; \
42 echo '#define DEFAULTKEYSFILE "$(DEFAULT_KEYSFILE)"'; \ 46 echo '#define DEFAULTKEYSFILE "$(DEFAULT_KEYSFILE)"'; \
43 echo '#define DEFAULT_INITFILE "$(DEFAULT_INITFILE)"'; \ 47 echo '#define DEFAULT_INITFILE "$(DEFAULT_INITFILE)"'; \
48 echo '#define PROGRAM_PREFIX "$(PROGRAM_PREFIX:NONE=)"'; \
49 echo '#define PROGRAM_SUFFIX "$(PROGRAM_SUFFIX:NONE=)"'; \
50 echo 'std::string realProgramName(std::string name);'; \
44 echo 'const char* svnversion(void);' ) > defaults.hh 51 echo 'const char* svnversion(void);' ) > defaults.hh
45 52
46defaults.cc: force 53defaults.cc: force
47 @( \ 54 @( \
55 echo '#include "defaults.hh"'; \
56 echo ''; \
57 echo 'std::string realProgramName(std::string name) {'; \
58 echo ' return PROGRAM_PREFIX + name + PROGRAM_SUFFIX;'; \
59 echo '}'; \
60 echo ''; \
48 echo 'const char* svnversion(void) {'; \ 61 echo 'const char* svnversion(void) {'; \
49 echo ' return "'`(svnversion . | sed "s/[^0-9].*//") 2> /dev/null`'";';\ 62 echo ' return "'`(svnversion . | sed "s/[^0-9].*//") 2> /dev/null`'";';\
50 echo '}' ) > defaults_tmp.cc 63 echo '}' ) > defaults_tmp.cc