LU-3939 tests: sanity-hsm/test_40 needs a local HSM_ARCHIVE

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

diff --git a/autoMakefile.am b/autoMakefile.am
index d45897a..ae9f30a 100644 (file)
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -72,7 +72,7 @@ all-am: modules
 modules: $(DEP) all-sources
        $(MAKE) CC="$(CC)" $(CROSS_VARS) -C $(LINUX_OBJ)             \
        -f $(PWD)/build/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) \
-       LINUXINCLUDE='$(EXTRA_LNET_INCLUDE) -I$$(srctree)/arch/$$(SRCARCH)/include -I$$(srctree)/arch/$$(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)' \
+       LINUXINCLUDE='-I$$(srctree)/arch/$$(SRCARCH)/include -I$$(srctree)/arch/$$(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 \
        include/config/MARKER $@
 endif # LINUX
@@ -99,6 +99,7 @@ rpms: @PACKAGE_TARNAME@.spec dist Makefile
        for arg in $(ac_configure_args); do \
                case $$arg in \
                        --with-release=* ) ;; \
+                       --with-kmp-moddir=* ) ;; \
                        --enable-tests | --disable-tests ) ;; \
                        --with-linux=* | --with-linux-obj=* ) ;; \
                        * ) CONFIGURE_ARGS="$$CONFIGURE_ARGS '$$arg'" ;; \
@@ -111,6 +112,9 @@ rpms: @PACKAGE_TARNAME@.spec dist Makefile
                        RPMARGS="$$RPMARGS --define \"kobjdir @LINUX_OBJ@\""; \
                fi; \
        fi; \
+       if [ -n "@KMP_MODDIR@" ]; then \
+               RPMARGS="$$RPMARGS --define \"kmoddir @KMP_MODDIR@\""; \
+       fi; \
        if [ -n "@CROSS_PATH@" ]; then \
                if [[ "X$(BUILD_SERVER)" = Xtrue ]]; then \
                        echo -e "\n" \
@@ -252,8 +256,8 @@ checkstack-clean:
        rm -f ${CSTK} ${CSTKO}
 
 module-dist-hook:
-       if [ -d CVS -o -d .git ]; then \
-               perl lustre/scripts/make_META.pl > $(distdir)/META; \
+       if [ -d .git ]; then \
+               perl lustre/scripts/version_tag.pl --make_META > $(distdir)/META; \
        elif [ -f META ]; then \
                cp META $(distdir)/META; \
        else \