diff options
| author | Hib Eris <hib@hiberis.nl> | 2010-07-26 09:58:51 (GMT) |
|---|---|---|
| committer | Hib Eris <hib@hiberis.nl> | 2010-07-26 13:34:18 (GMT) |
| commit | c32bea667da3de3379f86787d8f298caeea3a789 (patch) | |
| tree | 67c53e9e55f316db4a2b43d42407afb32bf7a871 /shell | |
| parent | d28b2a4d0bfa944532cec1512a2fa73ef24ebd6d (diff) | |
[build] Rename DATADIR with EVINCEDATADIR
Defining DATADIR conflicts with win32 api (ObjIdl.h), so this define is
renamed to EVINCEDATADIR.
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Makefile.am | 4 | ||||
| -rw-r--r-- | shell/ev-application.c | 2 | ||||
| -rw-r--r-- | shell/main.c | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am index 8336230..d5c5010 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -1,5 +1,5 @@ INCLUDES= \ - -DDATADIR=\"$(pkgdatadir)\" \ + -DEVINCEDATADIR=\"$(pkgdatadir)\" \ -DGNOMEDATADIR=\"$(datadir)\" \ -I$(top_srcdir) \ -I$(top_builddir) \ @@ -131,7 +131,7 @@ evinced_SOURCES= \ ev-daemon.c evinced_CFLAGS= \ - -DDATADIR=\"$(pkgdatadir)\" \ + -DEVINCEDATADIR=\"$(pkgdatadir)\" \ -DGNOMEDATADIR=\"$(datadir)\" \ -I$(top_srcdir) \ -I$(top_builddir) \ diff --git a/shell/ev-application.c b/shell/ev-application.c index 0bb7a39..5327825 100644 --- a/shell/ev-application.c +++ b/shell/ev-application.c @@ -985,7 +985,7 @@ ev_application_init (EvApplication *ev_application) g_free (dir); } #else - ev_application->data_dir = g_strdup (DATADIR); + ev_application->data_dir = g_strdup (EVINCEDATADIR); #endif ev_application_init_session (ev_application); diff --git a/shell/main.c b/shell/main.c index 8d057a0..7d4fb0d 100644 --- a/shell/main.c +++ b/shell/main.c @@ -41,9 +41,6 @@ #endif /* WITH_SMCLIENT */ #ifdef G_OS_WIN32 -#ifdef DATADIR -#undef DATADIR -#endif #include <io.h> #include <conio.h> #if !(_WIN32_WINNT >= 0x0500) |