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 'help/reference') diff --git a/help/reference/libdocument/Makefile.am b/help/reference/libdocument/Makefile.am index 03dcf52..f7dace3 100644 --- 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 bfcffcd..d596dab 100644 --- 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 3d267d5..8c3ee73 100644 --- 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"\" \ -- cgit v0.9.1