Revert Makefile's changes to let use local_dev.ini in tests.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/0abdba01 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/0abdba01 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/0abdba01 Branch: refs/heads/1744-single-config-file Commit: 0abdba016685b9981d44bb808b3959174825d3a4 Parents: 9f7d86b Author: Alexander Shorin <[email protected]> Authored: Sun Jul 7 19:23:22 2013 +0400 Committer: Alexander Shorin <[email protected]> Committed: Sun Jul 7 19:23:22 2013 +0400 ---------------------------------------------------------------------- etc/couchdb/Makefile.am | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/0abdba01/etc/couchdb/Makefile.am ---------------------------------------------------------------------- diff --git a/etc/couchdb/Makefile.am b/etc/couchdb/Makefile.am index 8a2326e..dd4ba17 100644 --- a/etc/couchdb/Makefile.am +++ b/etc/couchdb/Makefile.am @@ -14,7 +14,7 @@ couchprivlibdir = $(localerlanglibdir)/couch-$(version)/priv/lib devcouchprivlibdir = $(abs_top_builddir)/src/couchdb/priv/.libs localconf_DATA = default.ini -noinst_DATA = default_dev.ini +noinst_DATA = default_dev.ini local_dev.ini CLEANFILES = $(localconf_DATA) $(noinst_DATA) @@ -66,6 +66,14 @@ default_dev.ini: default.ini.tpl -e "s|%version%|$(version)|g" \ < $< > $@ +# Noah said to not specify local.ini but it borks +# VPATH builds that make distcheck uses. +local_dev.ini: + if test ! -f "$@"; then \ + touch $@; \ + chmod +w $@; \ + fi + install-data-hook: if test ! "$(mkdir_p)" = ""; then \ $(mkdir_p) "$(DESTDIR)$(localconfdir)/default.d"; \
