From b6947c0ba7c965de1614e491c37c8e0333de9e94 Mon Sep 17 00:00:00 2001
From: Paul Joseph Davis <davisp@apache.org>
Date: Tue, 18 Aug 2009 04:27:07 +0000
Subject: Fixing make distcheck errors.

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@805272 13f79535-47bb-0310-9956-ffa450edef68
---
 etc/couchdb/Makefile.am | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'etc/couchdb/Makefile.am')

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 \
-- 
cgit v1.2.3