LU-384 land bz22281 on b1_8

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

diff --git a/autoMakefile.am b/autoMakefile.am
index 87f7181..1505d6b 100644 (file)
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -8,9 +8,27 @@ EXTRA_SOURCES := @SYMVERFILE@
 endif
 endif
 
+@TESTS_TRUE@BUILD_TESTS = true
+@TESTS_FALSE@BUILD_TESTS = false
+
 include build/autoMakefile.am.toplevel
 
-EXTRA_DIST += config.h.in debian/*
+EXTRA_DIST += config.h.in
+
+if USES_DPKG
+EXTRA_DIST += debian/control.modules.in debian/control.main \
+             debian/linux-patch-lustre.kpatches \
+             debian/lustre-utils.examples debian/copyright debian/source \
+             debian/source/format debian/lustre-source.docs \
+             debian/lustre-utils.docs debian/lustre-utils.manpages \
+             debian/lustre-client-modules.install debian/README.Debian \
+             debian/.gitignore debian/linux-patch-lustre.dirs \
+             debian/linux-patch-lustre.unpatch debian/lustre-dev.install \
+             debian/lustre-source.dirs debian/liblustre.install debian/rules \
+             debian/lustre-dev.dirs debian/linux-patch-lustre.apply \
+             debian/control debian/changelog debian/lustre-tests.install \
+             debian/lustre-utils.install
+endif
 
 if LDISKFS_ENABLED
 if !LDISKFS_IN_KERNEL
@@ -39,9 +57,24 @@ checkstack-clean:
 
 module-dist-hook:
        if [ -d CVS -o -d .git ]; then \
-           perl lustre/scripts/tree_status.pl > $(distdir)/tree_status; \
-       elif [ -f tree_status ]; then \
-           cp tree_status $(distdir)/tree_status; \
+           perl lustre/scripts/make_META.pl > $(distdir)/META; \
+           cp $(distdir)/META $(distdir)/ldiskfs/META; \
+       elif [ -f META ]; then \
+           cp META $(distdir)/META; \
+           cp $(distdir)/META $(distdir)/ldiskfs/META; \
        else \
-           echo -e "I have no idea how to create a tree_status file in $(distdir).\nPlease file a bug at http://bugzilla.lustre.org/"; \
+           echo -e "I have no idea how to create a META file in $(distdir).\nPlease file a bug at http://bugzilla.lustre.org/"; \
+           exit 1; \
+       fi
+       if [ -d .git ]; then \
+               build/extract_patches $(distdir); \
+               if grep -e "^--- .*\/autoconf" -e "^--- .*\/Makefile\.am" -e ".*\/configure\.ac" -e ".*\/configure\.in" $(distdir)/debian/patches/*; then \
+                       cp build/autogen.sh $(distdir)/build; \
+                       cp libsysio/autogen.sh $(distdir)/libsysio; \
+                       cp lustre-iokit/autogen.sh $(distdir)/lustre-iokit; \
+               fi; \
+               mkdir empty; \
+               diff -urN empty $(distdir)/debian > debian.diff; \
+               rm -rf $(distdir)/debian; \
+               rmdir empty; \
        fi