diff options
| author | scarab <scarab@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e> | 2008-08-18 17:28:19 +0000 |
|---|---|---|
| committer | scarab <scarab@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e> | 2008-08-18 17:28:19 +0000 |
| commit | eefb6affd420af8c512e8733a6c9e2f5aabd5854 (patch) | |
| tree | 51579ca43516216f23706c1a1cb939703fcfeb15 /src | |
| parent | ad4f9593333a732f4220463977d0d435f6bfdb3b (diff) | |
- dalsi zmena v instalaci (prehlednutej docdir)
- nejprve nez budete kompilovat udelejte # make uninstall
git-svn-id: http://opensvn.csie.org/tuxanci_ng@220 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e
Diffstat (limited to 'src')
| -rw-r--r-- | src/base/path.h.in | 6 | ||||
| -rw-r--r-- | src/screen/screen_credits.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/base/path.h.in b/src/base/path.h.in index c9f9a53..5333ae8 100644 --- a/src/base/path.h.in +++ b/src/base/path.h.in @@ -4,16 +4,16 @@ #define TUXANCI_VERSION "@TUXANCI_VERSION@" #define PATH_H #define PREFIX "@CMAKE_INSTALL_PREFIX@" - #define PATH_DIR "@CMAKE_DATA_PATH@" "/" APPNAME "/" #ifdef PUBLIC_SERVER #define APPNAME "tuxanci-server" #define SERVER_CONFIG "@CMAKE_CONF_PATH@" "/" APPNAME "/server.conf" #else #define APPNAME "tuxanci" #endif + #define PATH_DIR "@CMAKE_DATA_PATH@" "/" APPNAME "-" "@TUXANCI_VERSION@" "/" // windows bug #ifndef __WIN32__ - #define PATH_MODULES "@LIB_INSTALL_DIR@" "/" APPNAME "/" + #define PATH_MODULES "@LIB_INSTALL_DIR@" "/" APPNAME "-" "@TUXANCI_VERSION@" "/" #else #define PATH_MODULES PREFIX "/bin/" #endif @@ -24,7 +24,7 @@ #define PATH_MUSIC PATH_DIR "music/" #define PATH_CONFIG PATH_DIR "conf/" #define PATH_LANG PATH_DIR "lang/" - #define PATH_DATA PATH_DIR "doc/" + #define PATH_DOC "@CMAKE_DOC_PATH@" "doc/" APPNAME "-" "@TUXANCI_VERSION@" "/" #define PATH_LOCALE PREFIX "share/locale/" #include "main.h" #endif diff --git a/src/screen/screen_credits.c b/src/screen/screen_credits.c index 5a8e9b8..37f16ea 100644 --- a/src/screen/screen_credits.c +++ b/src/screen/screen_credits.c @@ -107,10 +107,10 @@ void initScreenCredits() listWidgetLabel = newList(); - if( tryExistFile(PATH_DATA SCREEN_CREDITS_FILE) == 0 ) + if( tryExistFile(PATH_DOC SCREEN_CREDITS_FILE) == 0 ) { creditExists = 1; - textFile = loadTextFile(PATH_DATA SCREEN_CREDITS_FILE); + textFile = loadTextFile(PATH_DOC SCREEN_CREDITS_FILE); for( i = 0 ; i < textFile->text->count ; i++ ) { widget_t *label; @@ -129,7 +129,7 @@ void initScreenCredits() creditExists = 0; widget_t *label; char *line; - line = "Credit file not found..."; + line = "Credit file not found... %s/%s",PATH_DOC,SCREEN_CREDITS_FILE; label = newWidgetLabel(line, WINDOW_SIZE_X/2, (WINDOW_SIZE_Y-100)+i*20, WIDGET_LABEL_CENTER); |