From: Jiri Denemark <jdenemar@redhat.com>
Date: Wed, 23 Dec 2009 13:29:57 +0000 (+0100)
Subject: Rename DATADIR to PKGDATADIR to fix win32 build
X-Git-Tag: v0.7.5~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=913ab198fb93851e3ca05e545f2d0ce43d9c4852;p=thirdparty%2Flibvirt.git

Rename DATADIR to PKGDATADIR to fix win32 build

* src/Makefile.am src/cpu/cpu_map.c: rename in Makefile and in the
  cpu map loading code
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 42108c0634..51a40b6c61 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,7 +16,7 @@ INCLUDES =							\
 		-DSBINDIR=\""$(sbindir)"\"			\
 		-DSYSCONF_DIR="\"$(sysconfdir)\""		\
 		-DLOCALEBASEDIR=\""$(datadir)/locale"\"		\
-		-DDATADIR=\""$(pkgdatadir)"\"			\
+		-DPKGDATADIR=\""$(pkgdatadir)"\"		\
 		-DLOCAL_STATE_DIR=\""$(localstatedir)"\"	\
 		-DGETTEXT_PACKAGE=\"$(PACKAGE)\"		\
 		$(WARN_CFLAGS)					\
diff --git a/src/cpu/cpu_map.c b/src/cpu/cpu_map.c
index d615e15195..4731e13607 100644
--- a/src/cpu/cpu_map.c
+++ b/src/cpu/cpu_map.c
@@ -30,7 +30,7 @@
 
 #define VIR_FROM_THIS VIR_FROM_CPU
 
-#define CPUMAPFILE DATADIR "/cpu_map.xml"
+#define CPUMAPFILE PKGDATADIR "/cpu_map.xml"
 
 
 static int load(xmlXPathContextPtr ctxt,