diff options
| -rw-r--r-- | etc/couchdb/Makefile.am | 4 | ||||
| -rw-r--r-- | etc/couchdb/local.ini | 2 |
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" - - |