LU-9183 llite: handle flags as argument for inode_operations->rename

[fs/lustre-release.git] / autoMakefile.am

diff --git a/autoMakefile.am b/autoMakefile.am
index 13a00de..0054f72 100644 (file)
--- 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; \