Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/previewer
diff options
context:
space:
mode:
Diffstat (limited to 'previewer')
-rw-r--r--previewer/Makefile.am2
-rw-r--r--previewer/ev-previewer-window.c2
-rw-r--r--previewer/ev-previewer.c3
3 files changed, 2 insertions, 5 deletions
diff --git a/previewer/Makefile.am b/previewer/Makefile.am
index da0706c..ab8f95d 100644
--- a/previewer/Makefile.am
+++ b/previewer/Makefile.am
@@ -7,7 +7,7 @@ evince_previewer_SOURCES = \
ev-previewer-window.c
evince_previewer_CPPFLAGS = \
- -DDATADIR=\"$(pkgdatadir)\" \
+ -DEVINCEDATADIR=\"$(pkgdatadir)\" \
-I$(top_srcdir) \
-I$(top_builddir) \
-I$(top_srcdir)/libdocument \
diff --git a/previewer/ev-previewer-window.c b/previewer/ev-previewer-window.c
index 67c1708..734941e 100644
--- a/previewer/ev-previewer-window.c
+++ b/previewer/ev-previewer-window.c
@@ -487,7 +487,7 @@ data_dir (void)
datadir = g_build_filename (dir, "share", "evince", NULL);
g_free (dir);
#else
- datadir = g_strdup (DATADIR);
+ datadir = g_strdup (EVINCEDATADIR);
#endif
return datadir;
diff --git a/previewer/ev-previewer.c b/previewer/ev-previewer.c
index 2b8dea3..5029079 100644
--- a/previewer/ev-previewer.c
+++ b/previewer/ev-previewer.c
@@ -28,9 +28,6 @@
#include "ev-previewer-window.h"
#ifdef G_OS_WIN32
-#ifdef DATADIR
-#undef DATADIR
-#endif
#include <io.h>
#include <conio.h>
#if !(_WIN32_WINNT >= 0x0500)