You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ns...@apache.org on 2008/10/25 22:15:24 UTC

svn commit: r707898 - in /incubator/couchdb/trunk/etc/couchdb: Makefile.am local.ini

Author: nslater
Date: Sat Oct 25 13:15:24 2008
New Revision: 707898

URL: http://svn.apache.org/viewvc?rev=707898&view=rev
Log:
corrected build for local.ini

Modified:
    incubator/couchdb/trunk/etc/couchdb/Makefile.am
    incubator/couchdb/trunk/etc/couchdb/local.ini

Modified: incubator/couchdb/trunk/etc/couchdb/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/etc/couchdb/Makefile.am?rev=707898&r1=707897&r2=707898&view=diff
==============================================================================
--- incubator/couchdb/trunk/etc/couchdb/Makefile.am (original)
+++ incubator/couchdb/trunk/etc/couchdb/Makefile.am Sat Oct 25 13:15:24 2008
@@ -14,7 +14,7 @@
 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 @@
 
 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:

Modified: incubator/couchdb/trunk/etc/couchdb/local.ini
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/etc/couchdb/local.ini?rev=707898&r1=707897&r2=707898&view=diff
==============================================================================
--- incubator/couchdb/trunk/etc/couchdb/local.ini (original)
+++ incubator/couchdb/trunk/etc/couchdb/local.ini Sat Oct 25 13:15:24 2008
@@ -16,5 +16,3 @@
 
 [update_notification]
 ;unique notifier name=/full/path/to/exe -with "cmd line arg"
-
-