Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/shell/Makefile.am
diff options
context:
space:
mode:
authorHib Eris <hib@hiberis.nl>2010-07-26 09:58:51 (GMT)
committer Hib Eris <hib@hiberis.nl>2010-07-26 13:34:18 (GMT)
commitc32bea667da3de3379f86787d8f298caeea3a789 (patch)
tree67c53e9e55f316db4a2b43d42407afb32bf7a871 /shell/Makefile.am
parentd28b2a4d0bfa944532cec1512a2fa73ef24ebd6d (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/Makefile.am')
-rw-r--r--shell/Makefile.am4
1 files changed, 2 insertions, 2 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) \