From ad39776f1a0f2d48eb1bcf6ce5c5b6e00655dac8 Mon Sep 17 00:00:00 2001
From: Noah Slater <nslater@apache.org>
Date: Sat, 25 Oct 2008 20:15:24 +0000
Subject: corrected build for local.ini

git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@707898 13f79535-47bb-0310-9956-ffa450edef68
---
 etc/couchdb/Makefile.am | 4 ++--
 etc/couchdb/local.ini   | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'etc')

diff --git a/etc/couchdb/Makefile.am b/etc/couchdb/Makefile.am
index 2910fe2f..63bf896f 100644
--- a/etc/couchdb/Makefile.am
+++ b/etc/couchdb/Makefile.am
@@ -14,7 +14,7 @@ couchprivlibdir = $(localerlanglibdir)/couch-$(version)/priv/lib
 devcouchprivlibdir = $(abs_top_srcdir)/src/couchdb/.libs
 
 localconf_DATA = default.ini
-EXTRA_DIST = local.ini
+dist_noinst_DATA = local.ini
 noinst_DATA = default_dev.ini
 
 CLEANFILES = $(localconf_DATA) $(noinst_DATA)
@@ -45,7 +45,7 @@ default_dev.ini: default.ini.tpl
 
 install-data-hook:
 	if test ! -f "$(DESTDIR)/$(localconfdir)/local.ini"; then \
-	    cp local.ini "$(DESTDIR)/$(localconfdir)/local.ini"; \
+	    cp $(srcdir)/local.ini "$(DESTDIR)/$(localconfdir)/local.ini"; \
 	fi
 
 uninstall-local:
diff --git a/etc/couchdb/local.ini b/etc/couchdb/local.ini
index 53d1e60e..228849cd 100644
--- a/etc/couchdb/local.ini
+++ b/etc/couchdb/local.ini
@@ -16,5 +16,3 @@
 
 [update_notification]
 ;unique notifier name=/full/path/to/exe -with "cmd line arg"
-
-
-- 
cgit v1.2.3