summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorPaul Joseph Davis <davisp@apache.org>2009-08-18 04:27:07 +0000
committerPaul Joseph Davis <davisp@apache.org>2009-08-18 04:27:07 +0000
commitb6947c0ba7c965de1614e491c37c8e0333de9e94 (patch)
treead77c7c24cd19343ed9936d71002163f4b033f53 /etc
parentcaeae66a3f428f2b4f4a3084cf6752bee77fb1b9 (diff)
Fixing make distcheck errors.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@805272 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'etc')
-rw-r--r--etc/couchdb/Makefile.am8
1 files changed, 6 insertions, 2 deletions
diff --git a/etc/couchdb/Makefile.am b/etc/couchdb/Makefile.am
index 253634de..805274c4 100644
--- a/etc/couchdb/Makefile.am
+++ b/etc/couchdb/Makefile.am
@@ -56,8 +56,12 @@ default_dev.ini: default.ini.tpl
-e "s|%couchjs_command_name%|$(couchjs_dev_command_name)|g" \
< $< > $@
-local_dev.ini:
- cp local.ini $@
+# Noah said to not specify local.ini but it borks
+# VPATH builds that make distcheck uses.
+local_dev.ini: local.ini
+ if test ! -f "$@"; then \
+ cp $< $@; \
+ fi
install-data-hook:
if test ! -f "$(DESTDIR)$(localconfdir)/local.ini"; then \