diff options
author | Hib Eris <hib@hiberis.nl> | 2010-07-26 09:58:51 (GMT) |
---|---|---|
committer | Hib Eris <hib@hiberis.nl> | 2010-07-26 13:34:18 (GMT) |
commit | c32bea667da3de3379f86787d8f298caeea3a789 (patch) | |
tree | 67c53e9e55f316db4a2b43d42407afb32bf7a871 /help/reference | |
parent | d28b2a4d0bfa944532cec1512a2fa73ef24ebd6d (diff) |
[build] Rename DATADIR with EVINCEDATADIR
Defining DATADIR conflicts with win32 api (ObjIdl.h), so this define is
renamed to EVINCEDATADIR.
Diffstat (limited to 'help/reference')
-rw-r--r-- | help/reference/libdocument/Makefile.am | 2 | ||||
-rw-r--r-- | help/reference/libview/Makefile.am | 2 | ||||
-rw-r--r-- | help/reference/shell/Makefile.am | 2 |
3 files changed, 3 insertions, 3 deletions
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"\" \ |