# HG changeset patch # User [email protected] # Date 1291731529 18000 # Node ID b4ef59ed08a9a4c1387fd00cd79aec3398bca3f5 # Parent 3be1829b46b70a8ae4b2013fc20b71a76f3b55ee 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 <[email protected]> diff -r 3be1829b46b7 -r b4ef59ed08a9 Makefile.in --- a/Makefile.in Tue Oct 12 12:15:54 2010 +0100 +++ b/Makefile.in Tue Dec 07 09:18:49 2010 -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 3be1829b46b7 -r b4ef59ed08a9 Makefile.xcp --- a/Makefile.xcp Tue Oct 12 12:15:54 2010 +0100 +++ b/Makefile.xcp Tue Dec 07 09:18:49 2010 -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 [email protected] http://lists.xensource.com/mailman/listinfo/xen-api
