diff options
| author | Ryan Pavlik <rpavlik@iastate.edu> | 2011-10-31 15:29:42 (GMT) |
|---|---|---|
| committer | Ryan Pavlik <rpavlik@iastate.edu> | 2011-10-31 15:54:33 (GMT) |
| commit | ea5f7b56ecceaa638133f406a954d324f8e720c6 (patch) | |
| tree | 7ce81ee1ffc937665bef7edeeca571b9a3b94e9c /src/Makefile.am | |
| parent | 65cb53b68551fde7dafe97f08c90b69f972f93ef (diff) | |
| download | fluxbox-ea5f7b56ecceaa638133f406a954d324f8e720c6.zip fluxbox-ea5f7b56ecceaa638133f406a954d324f8e720c6.tar.bz2 | |
src/Makefile.am,FbTk/StringUtil.cc: Search relative to the executable.
On Windows, prepend /DUMMYPREFIX to default paths, and replace it at
runtime with the prefix relative to the exe directory.
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 1a04e4e..9a84897 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
| @@ -48,13 +48,19 @@ defaults.hh: Makefile | |||
| 48 | echo '// This file is generated from Makefile. Do not edit!'; \ | 48 | echo '// This file is generated from Makefile. Do not edit!'; \ |
| 49 | echo '#include <string>'; \ | 49 | echo '#include <string>'; \ |
| 50 | echo ''; \ | 50 | echo ''; \ |
| 51 | echo '#define DEFAULTMENU "$(DEFAULT_MENU)"'; \ | 51 | echo '#ifdef _WIN32'; \ |
| 52 | echo '#define DEFAULTSTYLE "$(DEFAULT_STYLE)"'; \ | 52 | echo '#define DUMMYPREFIX "/DUMMYPREFIX"'; \ |
| 53 | echo '#define DEFAULTKEYSFILE "$(DEFAULT_KEYSFILE)"'; \ | 53 | echo '#define PATHPREFIX DUMMYPREFIX'; \ |
| 54 | echo '#define DEFAULT_APPSFILE "$(DEFAULT_APPSFILE)"'; \ | 54 | echo '#else'; \ |
| 55 | echo '#define DEFAULT_OVERLAY "$(DEFAULT_OVERLAY)"'; \ | 55 | echo '#define PATHPREFIX'; \ |
| 56 | echo '#define DEFAULT_INITFILE "$(DEFAULT_INITFILE)"'; \ | 56 | echo '#endif'; \ |
| 57 | echo '#define DEFAULT_WINDOWMENU "$(DEFAULT_WINDOWMENU)"'; \ | 57 | echo '#define DEFAULTMENU PATHPREFIX "$(DEFAULT_MENU)"'; \ |
| 58 | echo '#define DEFAULTSTYLE PATHPREFIX "$(DEFAULT_STYLE)"'; \ | ||
| 59 | echo '#define DEFAULTKEYSFILE PATHPREFIX "$(DEFAULT_KEYSFILE)"'; \ | ||
| 60 | echo '#define DEFAULT_APPSFILE PATHPREFIX "$(DEFAULT_APPSFILE)"'; \ | ||
| 61 | echo '#define DEFAULT_OVERLAY PATHPREFIX "$(DEFAULT_OVERLAY)"'; \ | ||
| 62 | echo '#define DEFAULT_INITFILE PATHPREFIX "$(DEFAULT_INITFILE)"'; \ | ||
| 63 | echo '#define DEFAULT_WINDOWMENU PATHPREFIX "$(DEFAULT_WINDOWMENU)"'; \ | ||
| 58 | echo '#define PROGRAM_PREFIX "$(PROGRAM_PREFIX:NONE=)"'; \ | 64 | echo '#define PROGRAM_PREFIX "$(PROGRAM_PREFIX:NONE=)"'; \ |
| 59 | echo '#define PROGRAM_SUFFIX "$(PROGRAM_SUFFIX:NONE=)"'; \ | 65 | echo '#define PROGRAM_SUFFIX "$(PROGRAM_SUFFIX:NONE=)"'; \ |
| 60 | echo 'std::string realProgramName(const std::string& name);'; \ | 66 | echo 'std::string realProgramName(const std::string& name);'; \ |