Author: davisp
Date: Thu Jul 23 15:12:09 2009
New Revision: 797097
URL: http://svn.apache.org/viewvc?rev=797097&view=rev
Log:
Make local_dev.ini a build product.
Finally fixing the local_dev.ini problem. local.ini will be copied over to
local_dev.ini anytime the latter doesn't exist.
Removed:
couchdb/trunk/etc/couchdb/local_dev.ini
Modified:
couchdb/trunk/etc/couchdb/ (props changed)
couchdb/trunk/etc/couchdb/Makefile.am
Propchange: couchdb/trunk/etc/couchdb/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jul 23 15:12:09 2009
@@ -3,3 +3,4 @@
default.ini
default_dev.ini
default.ini.tpl
+local_dev.ini
Modified: couchdb/trunk/etc/couchdb/Makefile.am
URL:
http://svn.apache.org/viewvc/couchdb/trunk/etc/couchdb/Makefile.am?rev=797097&r1=797096&r2=797097&view=diff
==============================================================================
--- couchdb/trunk/etc/couchdb/Makefile.am (original)
+++ couchdb/trunk/etc/couchdb/Makefile.am Thu Jul 23 15:12:09 2009
@@ -14,9 +14,9 @@
devcouchprivlibdir = $(abs_top_srcdir)/src/couchdb/.libs
localconf_DATA = default.ini
-noinst_DATA = default_dev.ini
+noinst_DATA = default_dev.ini local_dev.ini
-EXTRA_DIST = local.ini local_dev.ini
+EXTRA_DIST = local.ini
CLEANFILES = $(localconf_DATA) $(noinst_DATA)
@@ -44,6 +44,11 @@
-e "s|%couchjs_command_name%|$(couchjs_dev_command_name)|g" \
< $< > $@
+local_dev.ini: local.ini
+ if test ! -f "$@"; then \
+ cp $< $@; \
+ fi
+
install-data-hook:
if test ! -f "$(DESTDIR)/$(localconfdir)/local.ini"; then \
cp $(srcdir)/local.ini "$(DESTDIR)/$(localconfdir)/local.ini"; \
