diff options
| -rw-r--r-- | config.h | 2 | ||||
| -rw-r--r-- | src/base/main.h | 6 | ||||
| -rw-r--r-- | src/base/path.h | 20 |
3 files changed, 8 insertions, 20 deletions
@@ -1,4 +1,4 @@ -#define TUXANCI_NG_VERSION "svn98" +#define TUXANCI_NG_VERSION "svn99" #define DESTDIR "/usr/local/" diff --git a/src/base/main.h b/src/base/main.h index fcf1f4d..a8e5503 100644 --- a/src/base/main.h +++ b/src/base/main.h @@ -5,12 +5,6 @@ #include "../../config.h" -#if defined PUBLIC_SERVER - -#undef DESTDIR - -#endif - #include "bool.h" #include "string_length.h" #include "path.h" diff --git a/src/base/path.h b/src/base/path.h index a99bf83..ceea00e 100644 --- a/src/base/path.h +++ b/src/base/path.h @@ -5,19 +5,14 @@ #include "main.h" -#ifdef DESTDIR - -#define PATH_DIR "share/tuxanci-ng/" - +#ifndef PUBLIC_SERVER +#define PATH_DIR "share/tuxanci-ng/" +#define PATH_MODULES DESTDIR "lib/tuxanci-ng/" #endif -#ifndef DESTDIR - -#define PATH_DIR "./" - -#undef DESTDIR -#define DESTDIR "" - +#ifdef PUBLIC_SERVER +#define PATH_DIR "share/tuxanci-ng-server/" +#define PATH_MODULES DESTDIR "lib/tuxanci-ng-server/" #endif #define PATH_IMAGE DESTDIR PATH_DIR "image/" @@ -28,6 +23,5 @@ #define PATH_CONFIG DESTDIR PATH_DIR "conf/" #define PATH_LANG DESTDIR PATH_DIR "lang/" #define PATH_DATA DESTDIR PATH_DIR "doc/" -#define PATH_MODULES DESTDIR "lib/tuxanci-ng/" -#endif +#endif |