summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorNoah Slater <nslater@apache.org>2010-03-23 18:17:20 +0000
committerNoah Slater <nslater@apache.org>2010-03-23 18:17:20 +0000
commitc4a1667c9a0bd7817ad0905114322c450278ffd6 (patch)
tree1bb73e4ab28cd8f6f315b6fb97e720684a5eef7c /etc
parent61635f00be831a8cb52d5d93a8fbc619e87a73e7 (diff)
forward porting r926694
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@926698 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'etc')
-rw-r--r--etc/Makefile.am4
1 files changed, 2 insertions, 2 deletions
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" \