From bb816c498612de8358cfd8008921ab9efac636b7 Mon Sep 17 00:00:00 2001 From: James Simmons Date: Fri, 27 Sep 2013 11:04:57 -0400 Subject: [PATCH] LU-3959 build: fix make rpms for lustre-iokit With the recent merge of the lustre-iokit build system with lustre's build system on some platforms running make rpms from the top of the lustre tree breaks with make -C lustre-iokit rpms make[1]: Entering directory `lustre-2.4.93/lustre-iokit' make[1]: *** No rule to make target `rpms'. Stop. This patch removes the offending code in the makfile without breaking anything else. Signed-off-by: James Simmons Change-Id: I837ab1c2c383e1ca68eaadc492c3c8cf18cecb92 Reviewed-on: http://review.whamcloud.com/7771 Reviewed-by: Minh Diep Reviewed-by: Christopher J. Morrone Reviewed-by: Andreas Dilger Tested-by: Hudson Tested-by: Maloo Reviewed-by: Brian J. Murrell --- autoMakefile.am | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/autoMakefile.am b/autoMakefile.am index 0afd2ed..d45897a 100644 --- a/autoMakefile.am +++ b/autoMakefile.am @@ -94,7 +94,7 @@ EXTRA_DIST = @PACKAGE_TARNAME@.spec \ build/Rules.in \ build/gen_filelist.sh -rpms-real: @PACKAGE_TARNAME@.spec dist Makefile +rpms: @PACKAGE_TARNAME@.spec dist Makefile @CONFIGURE_ARGS=""; \ for arg in $(ac_configure_args); do \ case $$arg in \ @@ -152,7 +152,7 @@ rpms-real: @PACKAGE_TARNAME@.spec dist Makefile echo "Building Lustre RPM with $$RPMARGS"; \ eval rpmbuild $$RPMARGS -ta $(distdir).tar.gz -srpm-real: @PACKAGE_TARNAME@.spec dist Makefile +srpm: @PACKAGE_TARNAME@.spec dist Makefile if [[ "X$(BUILD_TESTS)" = Xfalse ]]; then \ RPMARGS="--without lustre_tests"; \ fi; \ @@ -161,18 +161,6 @@ srpm-real: @PACKAGE_TARNAME@.spec dist Makefile fi; \ eval rpmbuild $$RPMARGS -ts $(distdir).tar.gz -rpms: -if BUILD_LUSTREIOKIT - $(MAKE) -C @LUSTREIOKIT_SUBDIR@ $(AM_MAKEFLAGS) $@ -endif - $(MAKE) $(AM_MAKEFLAGS) rpms-real - -srpm: -if BUILD_LUSTREIOKIT - $(MAKE) -C @LUSTREIOKIT_SUBDIR@ $(AM_MAKEFLAGS) $@ -endif - $(MAKE) $(AM_MAKEFLAGS) srpm-real - # In the debs target, first make sure what's in the changelog reflects # the software version. Here's how we could dig the version out of the # autoconf version file directly: -- 1.8.3.1