[Xen-API] [PATCH 1 of 4] Query rpm to find build directories

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

# HG changeset patch
# User root@xxxxxxxxxxxxxxxxxxxxx
# Date 1294650964 18000
# Node ID c6eaf00013e159edd2e4e54cc5375a3e1a9ac623
# Parent  81da5ae856c06eba9344d84c7a7761637af3c154
Query rpm to find build directories.

Allows user with ~/.rpmmacros to build e.g.
$ cat ~/.rpmmacros
%_topdir        /data/rpmbuild
%_tmppath       /data/tmp

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>

diff -r 81da5ae856c0 -r c6eaf00013e1 Makefile.in
--- a/Makefile.in       Sat Oct 23 21:00:44 2010 +0100
+++ b/Makefile.in       Mon Jan 10 04:16:04 2011 -0500
@@ -211,8 +211,8 @@ cleanxen:
        $(MAKE) -C xsrpc clean
        $(MAKE) -C eventchn clean
 
-RPM_SPECSDIR=/usr/src/redhat/SPECS
-RPM_SOURCEDIR=/usr/src/redhat/SOURCES
+RPM_SPECSDIR=$(shell rpm --eval='%_specdir')
+RPM_SOURCEDIR=$(shell rpm --eval='%_sourcedir')
 XEN_RELEASE=xcp0.2
 
 $(RPM_SPECSDIR)/xapi-libs.spec: xapi.spec.in
diff -r 81da5ae856c0 -r c6eaf00013e1 Makefile.xcp
--- a/Makefile.xcp      Sat Oct 23 21:00:44 2010 +0100
+++ b/Makefile.xcp      Mon Jan 10 04:16:04 2011 -0500
@@ -6,9 +6,9 @@ MY_OUTPUT_DIR ?= $(CURDIR)/output
 MY_OBJ_DIR ?= $(CURDIR)/obj
 REPO ?= $(CURDIR)
 
-RPM_SPECSDIR?=/usr/src/redhat/SPECS
-RPM_SRPMSDIR?=/usr/src/redhat/SRPMS
-RPM_SOURCEDIR?=/usr/src/redhat/SOURCES
+RPM_SPECSDIR?=$(shell rpm --eval='%_specdir')
+RPM_SRPMSDIR?=$(shell rpm --eval='%_srcrpmdir')
+RPM_SOURCEDIR?=$(shell rpm --eval='%_sourcedir')
 XEN_RELEASE?=unknown
 endif
 

_______________________________________________
xen-api mailing list
xen-api@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/mailman/listinfo/xen-api