[build] Rename DATADIR with EVINCEDATADIR

Defining DATADIR conflicts with win32 api (ObjIdl.h), so this define is
renamed to EVINCEDATADIR.

diff --git a/backend/impress/Makefile.am b/backend/impress/Makefile.am
index c1da9a197c585c33bf2e3fc6eebb65dff6e952e9..9342d77d4552c7c41647beb50a338bc408a74e36 100644 (file)
--- a/backend/impress/Makefile.am
+++ b/backend/impress/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES =                                      \
        -I$(top_srcdir)                         \
        -I$(top_srcdir)/libdocument             \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\"  \
-       -DDATADIR=\""$(datadir)"\"              \
+       -DEVINCEDATADIR=\""$(datadir)"\"        \
        -DEVINCE_COMPILATION                    \
        $(BACKEND_CFLAGS)                       \
        $(WARN_CFLAGS)                          \

diff --git a/help/reference/libdocument/Makefile.am b/help/reference/libdocument/Makefile.am
index 03dcf529533b3fea58ad83a498f46eab0dc7a31b..f7dace3c8647e258da0ea8e905391c8eecad4eca 100644 (file)
--- a/help/reference/libdocument/Makefile.am
+++ b/help/reference/libdocument/Makefile.am
@@ -95,7 +95,7 @@ GTKDOC_CFLAGS = \
        -I$(top_srcdir)                                 \
        -I$(top_builddir)                               \
        -I$(top_srcdir)/libdocument                     \
-       -DDATADIR=\"$(pkgdatadir)\"                     \
+       -DEVINCEDATADIR=\"$(pkgdatadir)\"               \
        -DGNOMEDATADIR=\"$(datadir)\"                   \
        -DEVINCE_UIDIR=\"$(pkgdatadir)\"                \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\"          \

diff --git a/help/reference/libview/Makefile.am b/help/reference/libview/Makefile.am
index bfcffcdcd075315fc94be84a10b0400910428568..d596dabf33b59f1087902ad10a3856ec8f2a613d 100644 (file)
--- a/help/reference/libview/Makefile.am
+++ b/help/reference/libview/Makefile.am
@@ -101,7 +101,7 @@ GTKDOC_CFLAGS = \
        -I$(top_srcdir)/libview                         \
        -I$(top_srcdir)/libdocument                     \
        -I$(top_builddir)/libdocument                   \
-       -DDATADIR=\"$(pkgdatadir)\"                     \
+       -DEVINCEDATADIR=\"$(pkgdatadir)\"               \
        -DGNOMEDATADIR=\"$(datadir)\"                   \
        -DEVINCE_UIDIR=\"$(pkgdatadir)\"                \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\"          \

diff --git a/help/reference/shell/Makefile.am b/help/reference/shell/Makefile.am
index 3d267d5094c9baa1b968374865c6615ebe670f3b..8c3ee731a453e59a0d5c2f5d5a45be47d368cc35 100644 (file)
--- a/help/reference/shell/Makefile.am
+++ b/help/reference/shell/Makefile.am
@@ -99,7 +99,7 @@ GTKDOC_CFLAGS = \
        -I$(top_srcdir)/libmisc                         \
        -I$(top_builddir)/libview                       \
        -I$(top_srcdir)/properties                      \
-       -DDATADIR=\"$(pkgdatadir)\"                     \
+       -DEVINCEDATADIR=\"$(pkgdatadir)\"               \
        -DGNOMEDATADIR=\"$(datadir)\"                   \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\"          \
        -DGNOMEICONDIR=\""$(datadir)/pixmaps"\"         \

diff --git a/libmisc/Makefile.am b/libmisc/Makefile.am
index a6ec7745fcc9cdd9aefc404db06df1b7d42cd167..280970187b84f8a9be9500321b6c7493f2ed7f01 100644 (file)
--- a/libmisc/Makefile.am
+++ b/libmisc/Makefile.am
@@ -7,7 +7,7 @@ libevmisc_la_SOURCES = \
        ev-page-action-widget.h
 
 libevmisc_la_CFLAGS =  \
-       -DDATADIR=\"$(pkgdatadir)\"     \
+       -DEVINCEDATADIR=\"$(pkgdatadir)\"       \
        -I$(top_srcdir)                 \
        -I$(top_srcdir)/libdocument     \
        -I$(top_srcdir)/libview         \

diff --git a/libview/Makefile.am b/libview/Makefile.am
index 23210fa20ef2adf83f0f7d3ce31bf3d912828680..02e81f3b06806612e75e7f67d62394432d71695b 100644 (file)
--- a/libview/Makefile.am
+++ b/libview/Makefile.am
@@ -50,7 +50,7 @@ libevview_la_SOURCES =                        \
        $(INST_H_FILES)
 
 libevview_la_CPPFLAGS = \
-       -DDATADIR=\"$(pkgdatadir)\"             \
+       -DEVINCEDATADIR=\"$(pkgdatadir)\"       \
        -DG_LOG_DOMAIN=\"EvinceView\"           \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\"  \
        -DEVINCE_COMPILATION                    \

diff --git a/libview/ev-stock-icons.c b/libview/ev-stock-icons.c
index 5bbcbbfe367b3001526bb360903a24e754e4e1a9..47b3943e13337e525c029f396396175514cb7cba 100644 (file)
--- a/libview/ev-stock-icons.c
+++ b/libview/ev-stock-icons.c
@@ -100,7 +100,7 @@ ev_stock_icons_init (void)
        ev_icons_path = g_build_filename (dir, "share", "evince", "icons", NULL);
        g_free (dir);
 #else
-       ev_icons_path = g_build_filename (DATADIR, "icons", NULL);
+       ev_icons_path = g_build_filename (EVINCEDATADIR, "icons", NULL);
 #endif
 
         factory = gtk_icon_factory_new ();

diff --git a/previewer/Makefile.am b/previewer/Makefile.am
index da0706cf9ec8874bd55449b57462f04f48e89e74..ab8f95d7b35771f3e4b376843b07f7c33bddc641 100644 (file)
--- 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 67c17086597ae5e2459bcd1c98d3fd7e9e027430..734941edc99679924d40fd0b3202a2402f80e762 100644 (file)
--- 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 2b8dea364d5468486c236cd86d3146844da21bd3..50290798575cf0e2f09cf4fc40673d768e9bac55 100644 (file)
--- 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)

diff --git a/properties/Makefile.am b/properties/Makefile.am
index 67b7e7b519d86ce39ca0f863204f21193b35f6db..de90d72ed1caff4f70cea93d0863be2a3d004af2 100644 (file)
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -1,5 +1,5 @@
 INCLUDES=                                      \
-       -DDATADIR=\"$(pkgdatadir)\"             \
+       -DEVINCEDATADIR=\"$(pkgdatadir)\"       \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\"  \
        -I$(top_srcdir)                         \
        -I$(top_builddir)                       \

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 8336230f007890869122b807d56b3a1b4231fc3b..d5c5010154a4a11b7a3dac7a9623168990ff74d3 100644 (file)
--- 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 0bb7a3939a12cad193ae0cc9a87b9a84c5cf4eba..5327825d5b705860832b4476571c13ccc8de07d8 100644 (file)
--- 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 8d057a04ddeb6590113b48c4dbe814201acfac7d..7d4fb0d317b723f8e713a2deaa8a23b3a6b93e0d 100644 (file)
--- 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)

diff --git a/thumbnailer/Makefile.am b/thumbnailer/Makefile.am
index 45e3d2a86b98c006f4239bb7d0d07f286d363a96..171c00f6ee313c012e1d345014cd9eeb7b9ef759 100644 (file)
--- a/thumbnailer/Makefile.am
+++ b/thumbnailer/Makefile.am
@@ -5,7 +5,7 @@ evince_thumbnailer_SOURCES = \
        evince-thumbnailer.c
 
 evince_thumbnailer_CPPFLAGS = \
-       -DDATADIR=\"$(pkgdatadir)\"             \
+       -DEVINCEDATADIR=\"$(pkgdatadir)\"       \
        -I$(top_srcdir)                         \
        -I$(top_builddir)                       \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\"  \

diff --git a/thumbnailer/evince-thumbnailer.c b/thumbnailer/evince-thumbnailer.c
index 69c8a8d2620c340d388f69827d6bdc36302b3ce9..31da3d3cae1800852b9ac29d14665b396fba1591 100644 (file)
--- a/thumbnailer/evince-thumbnailer.c
+++ b/thumbnailer/evince-thumbnailer.c
@@ -26,9 +26,6 @@
 #include <string.h>
 
 #ifdef G_OS_WIN32
-#ifdef DATADIR
-#undef DATADIR
-#endif
 #include <io.h>
 #include <conio.h>
 #if !(_WIN32_WINNT >= 0x0500)
@@ -156,7 +153,7 @@ evince_thumbnail_pngenc_get (EvDocument *document, const char *thumbnail, int si
                        gchar *overlaid_icon_path = g_build_filename (dir, "share", "evince", overlaid_icon_name, NULL);
                        g_free (dir);
 #else
-                       gchar *overlaid_icon_path = g_strdup_printf ("%s/%s", DATADIR, overlaid_icon_name);
+                       gchar *overlaid_icon_path = g_strdup_printf ("%s/%s", EVINCEDATADIR, overlaid_icon_name);
 #endif
                        overlaid_pixbuf = gdk_pixbuf_new_from_file (overlaid_icon_path, NULL);
                        g_free (overlaid_icon_path);