From c4a1667c9a0bd7817ad0905114322c450278ffd6 Mon Sep 17 00:00:00 2001 From: Noah Slater Date: Tue, 23 Mar 2010 18:17:20 +0000 Subject: forward porting r926694 git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@926698 13f79535-47bb-0310-9956-ffa450edef68 --- Makefile.am | 4 ++++ etc/Makefile.am | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9c42b506..472b01c1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -123,6 +123,10 @@ local-clean: maintainer-clean rm -f $(top_srcdir)/*.tar.gz.* find $(top_srcdir) -name Makefile.in -exec rm {} \; +dist-hook: + find $(top_srcdir) -type f -name "._*" -delete + find $(top_builddir) -type f -name "._*" -delete + distcheck-hook: grep -rL 'http://www.apache.org/licenses/LICENSE-2.0' * \ | grep -vEf license.skip; \ diff --git a/etc/Makefile.am b/etc/Makefile.am index 1dc70c4c..c166636c 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -25,7 +25,7 @@ endif nobase_sysconf_DATA = $(default_sysconf_data) $(init_sysconf_data) -EXTRA_DIST = $(init_sysconf_data) +EXTRA_DIST = default/couchdb if WINDOWS EXTRA_DIST += windows/setup-couchdb-@version@.exe.md5 windows/setup-couchdb-@version@.exe.sha @@ -72,7 +72,7 @@ if WINDOWS # README.txt has \n line endings in the repo and must have \r\n # when installed as notepad is used to view it. # Also: the targets below don't seem to update after an svn-up (which -# changes the version string in the generated files) so we trick make +# changes the version string in the generated files) so we trick make # into always building it with the FORCE pattern... windows/README.txt: windows/README.txt.tpl FORCE sed -e "s|%package_name%|@package_name@|g" \ -- cgit v1.2.3