X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=autoMakefile.am;h=d45897a5d802cf54360b200fa7c01a2b91a1cbb2;hb=a3154dc85366d73b376fa5ae2b74bab502b9d8a9;hp=0afd2eda2fa256f9afbd5d2dba6d50ef804df8a4;hpb=a0a1066d30054540d853a067449b90f991b7554a;p=fs%2Flustre-release.git 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: