From: Minh Diep <mdiep@whamcloud.com>
Date: Thu, 5 Jan 2012 17:12:29 +0000 (-0800)
Subject: LU-955 build: fix bad lustre-backend-fs dependency
X-Git-Tag: 2.1.54~13
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=e760b61033909351e440fdbb1b465f551d2cc232;p=fs%2Flustre-release.git

LU-955 build: fix bad lustre-backend-fs dependency

Fix an incorrect RPM package dependency if Lustre RPMs are built
with "make rpms" with client only

Signed-off-by: Minh Diep <mdiep@whamcloud.com>
Change-Id: Ib8691a37fc230cc63b7aca48bc5146a67e10a2f0
Reviewed-on: http://review.whamcloud.com/1576
Reviewed-by: Brian J. Murrell <brian@whamcloud.com>
Tested-by: Hudson
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: Maloo <whamcloud.maloo@gmail.com>
---

diff --git a/autoMakefile.am b/autoMakefile.am
index d40970f..118b82c 100644
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -6,6 +6,10 @@ MODULE_SYMVERS_DEPS = module-symvers
 
 @TESTS_TRUE@BUILD_TESTS = true
 @TESTS_FALSE@BUILD_TESTS = false
+@SERVER_TRUE@BUILD_SERVER = true
+@SERVER_FALSE@BUILD_SERVER = false
+@CLIENT_TRUE@BUILD_CLIENT = true
+@CLIENT_FALSE@BUILD_CLIENT = false
 
 include build/autoMakefile.am.toplevel
 
diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index aa7c810..c91c613 100644
--- a/build/autoMakefile.am.toplevel
+++ b/build/autoMakefile.am.toplevel
@@ -118,6 +118,9 @@ rpms-real: @PACKAGE_TARNAME@.spec dist Makefile
 	if ! $(BUILD_TESTS); then \
 		RPMARGS="$$RPMARGS --define \"build_lustre_tests 0\""; \
 	fi; \
+	if ! $(BUILD_SERVER); then \
+		RPMARGS="$$RPMARGS --define \"lustre_name lustre-client\""; \
+	fi; \
 	echo "Building Lustre RPM with $$RPMARGS"; \
 	eval rpmbuild $$RPMARGS -ta $(distdir).tar.gz