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 42108c06346f6cf1eed06a8244d6fa2d9b683666..51a40b6c615ab9ab28cf97ba6132f3743e1f1b5d 100644 (file)
--- 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 d615e15195b6eca32c30629719572b727142818f..4731e136079de81744f50fb7ef48c4813079ef42 100644 (file)
--- 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,