THRIFT-1074. .keystore and .truststore are missing from the 0.6.0 distribution

Patch: Jake Farrell

git-svn-id: https://svn.apache.org/repos/asf/thrift/branches/0.6.x@1085165 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Makefile.am b/Makefile.am
index 6452276..abe87da 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,9 @@ ACLOCAL_AMFLAGS = -I ./aclocal
 SUBDIRS = compiler/cpp lib test
 
 dist-hook:
-       find $(distdir) -name '.[a-zA-Z0-9]*' | xargs rm -rf
+       find $(distdir) -type f \( -iname ".deps" -or -iname ".libs" -or -iname ".gitignore" \
+               -or -iname ".DS_Store" -or -iname "._*" \) | xargs rm -rf
+       find $(distdir) -type d \( -iname ".svn" -or -iname ".git" \) | xargs rm -rf
 
 print-version:
        @echo $(VERSION)

diff --git a/configure.ac b/configure.ac
index 629a83c..ab804da 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ AC_INIT([thrift], [0.6.0])
 
 AC_CONFIG_AUX_DIR([.])
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([1.9 tar-ustar])
 
 AC_ARG_VAR([PY_PREFIX], [Prefix for installing Python modules.
                          (Normal --prefix is ignored for Python because