From c32bea667da3de3379f86787d8f298caeea3a789 Mon Sep 17 00:00:00 2001
From: Hib Eris <hib@hiberis.nl>
Date: Mon, 26 Jul 2010 09:58:51 +0000
Subject: [build] Rename DATADIR with EVINCEDATADIR

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

diff --git a/libview/Makefile.am b/libview/Makefile.am
index 23210fa..02e81f3 100644
--- 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 5bbcbbf..47b3943 100644
--- 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 ();
--
cgit v0.9.1