summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorNoah Slater <nslater@apache.org>2008-10-25 20:15:24 +0000
committerNoah Slater <nslater@apache.org>2008-10-25 20:15:24 +0000
commitad39776f1a0f2d48eb1bcf6ce5c5b6e00655dac8 (patch)
tree41467c7aecfa551944b221ef589afb1a30f2097d /etc
parent512e78ad748fb6bbfa8b976243f86fbe49bc6a84 (diff)
corrected build for local.ini
git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@707898 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'etc')
-rw-r--r--etc/couchdb/Makefile.am4
-rw-r--r--etc/couchdb/local.ini2
2 files changed, 2 insertions, 4 deletions
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"
-
-