From: Cedric Le Goater <clg@fr.ibm.com>
Date: Fri, 21 Jan 2011 10:01:43 +0000 (+0100)
Subject: take into account new configure option --with-linuxdir
X-Git-Tag: lxc-0.7.4-rc1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfb8f06a3b1d35d736ce95ea121d4019ea391b26;p=thirdparty%2Flxc.git

take into account new configure option --with-linuxdir

Signed-off-by: Cedric Le Goater <clg@fr.ibm.com>
---

diff --git a/Makefile.am b/Makefile.am
index 9945d00c7..887e300d0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,4 +13,4 @@ ChangeLog::
 	@touch ChangeLog
 
 rpm: dist
-	rpmbuild --clean -ta ${distdir}.tar.gz
+	rpmbuild --clean -ta --define "ksrc ${LINUX_DIR}" ${distdir}.tar.gz
diff --git a/lxc.spec.in b/lxc.spec.in
index 379b53d76..452493de4 100644
--- a/lxc.spec.in
+++ b/lxc.spec.in
@@ -56,7 +56,8 @@ development of the linux containers.
 %prep
 %setup
 %build
-PATH=$PATH:/usr/sbin:/sbin %configure
+test "%{ksrc}" != "none" && args="--with-linuxdir=%{ksrc}"
+PATH=$PATH:/usr/sbin:/sbin %configure $args
 make %{?_smp_mflags}
 
 %install