svn commit: r926698 - in /couchdb/trunk: Makefile.am etc/Makefile.am

[ns...@apache.org]

Author: nslater
Date: Tue Mar 23 18:17:20 2010
New Revision: 926698

URL: http://svn.apache.org/viewvc?rev=926698&view=rev
Log:
forward porting r926694

Modified:
    couchdb/trunk/Makefile.am
    couchdb/trunk/etc/Makefile.am

Modified: couchdb/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/trunk/Makefile.am?rev=926698&r1=926697&r2=926698&view=diff
==============================================================================
--- couchdb/trunk/Makefile.am (original)
+++ couchdb/trunk/Makefile.am Tue Mar 23 18:17:20 2010
@@ -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; \

Modified: couchdb/trunk/etc/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/trunk/etc/Makefile.am?rev=926698&r1=926697&r2=926698&view=diff
==============================================================================
--- couchdb/trunk/etc/Makefile.am (original)
+++ couchdb/trunk/etc/Makefile.am Tue Mar 23 18:17:20 2010
@@ -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" \