On Tue, Dec 22, 2009 at 02:45:29PM +0100, Jiri Denemark wrote:
Signed-off-by: Jiri Denemark <jdenemar@redhat.com> --- src/Makefile.am | 2 +- src/cpu/cpu_map.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am index 42108c0..51a40b6 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 d615e15..4731e13 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,
ACK, both patches applied, thanks, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/