From c32bea667da3de3379f86787d8f298caeea3a789 Mon Sep 17 00:00:00 2001 From: Hib Eris 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 'shell/Makefile.am') 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) \ -- cgit v0.9.1