X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=autoMakefile.am;h=0054f7272e0c77469ab9a1504d1dad785a9f81f5;hp=13a00dea20e8c51ceb1d97ebe31525c93e35cfaf;hb=bc49f2b84d4403583b485ab9736cf6a9464977d4;hpb=3b7d27ea22faf1c6d0a37afa724fd9b5c3240322

diff --git a/autoMakefile.am b/autoMakefile.am
index 13a00de..0054f72 100644
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -72,7 +72,7 @@ if LINUX
 all-am: modules
 
 modules: undef.h ldiskfs-sources
-	$(MAKE) CC="$(CC)" -C $(LINUX_OBJ) \
+	$(MAKE) LDFLAGS= CC="$(CC)" -C $(LINUX_OBJ) \
 	-f $(PWD)/build/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) \
 	LINUXINCLUDE='-I$$(srctree)/arch/$$(SRCARCH)/include -Iarch/$$(SRCARCH)/include/generated -Iinclude $$(if $$(KBUILD_SRC),-Iinclude2 -I$$(srctree)/include) -I$$(srctree)/arch/$$(SRCARCH)/include/uapi -Iarch/$$(SRCARCH)/include/generated/uapi -I$$(srctree)/include/uapi -Iinclude/generated/uapi -include $(CONFIG_INCLUDE)' \
 	$(MODULE_TARGET)=$(PWD) -o tmp_include_depends -o scripts -o \
@@ -175,7 +175,6 @@ srpm: @PACKAGE_TARNAME@.spec dist Makefile
 	$(RPMBUILD) \
 		--define "_tmppath $$rpmbuilddir/TMP" \
 		--define "_topdir $$rpmbuilddir" \
-		--define "build_src_rpm 1" \
 		--define "dist %{nil}" \
 		-ts $(distdir).tar.gz || exit 1; \
 	cp $$rpmbuilddir/SRPMS/$(distdir)-*.src.rpm $(top_srcdir) || exit 1; \
@@ -190,7 +189,7 @@ debs: undef.h
 		echo -e "1i\nlustre ($$lversion-1) unstable; urgency=low\n\n  * Automated changelog entry update\n\n -- Brian J. Murrell <brian@interlinx.bc.ca>  $$(date -R)\n\n.\nwq" | ed debian/changelog; \
 	fi; \
 	rm -rf debs
-	dpkg-buildpackage -I.git -I\*.out[0-9]\* -I\*.swp || { \
+	dpkg-buildpackage -us -uc -I.git -I\*.out[0-9]\* -I\*.swp || { \
 		rc=$${PIPESTATUS[0]}; \
 		[ $${rc} -gt 1 ] && exit $${rc}; \
 		exit 0; \