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/09/11 21:42:15 UTC
svn commit: r694441 - in /incubator/couchdb/trunk: configure.ac
etc/Makefile.am etc/default/couchdb etc/default/couchdb.tpl.in
Author: nslater
Date: Thu Sep 11 12:42:14 2008
New Revision: 694441
URL: http://svn.apache.org/viewvc?rev=694441&view=rev
Log:
removed make packaging of etc/default/couchdb
Added:
incubator/couchdb/trunk/etc/default/couchdb (props changed)
- copied unchanged from r694432, incubator/couchdb/trunk/etc/default/couchdb.tpl.in
Removed:
incubator/couchdb/trunk/etc/default/couchdb.tpl.in
Modified:
incubator/couchdb/trunk/configure.ac
incubator/couchdb/trunk/etc/Makefile.am
Modified: incubator/couchdb/trunk/configure.ac
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/configure.ac?rev=694441&r1=694440&r2=694441&view=diff
==============================================================================
--- incubator/couchdb/trunk/configure.ac (original)
+++ incubator/couchdb/trunk/configure.ac Thu Sep 11 12:42:14 2008
@@ -233,7 +233,6 @@
AC_CONFIG_FILES([bin/Makefile])
AC_CONFIG_FILES([etc/couchdb/Makefile])
AC_CONFIG_FILES([etc/couchdb/default.ini.tpl])
-AC_CONFIG_FILES([etc/default/couchdb.tpl])
AC_CONFIG_FILES([etc/default/Makefile])
AC_CONFIG_FILES([etc/init/couchdb.tpl])
AC_CONFIG_FILES([etc/init/Makefile])
Modified: incubator/couchdb/trunk/etc/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/etc/Makefile.am?rev=694441&r1=694440&r2=694441&view=diff
==============================================================================
--- incubator/couchdb/trunk/etc/Makefile.am (original)
+++ incubator/couchdb/trunk/etc/Makefile.am Thu Sep 11 12:42:14 2008
@@ -30,20 +30,6 @@
transform = @program_transform_name@
couchdb_command_name = `echo couchdb | sed '$(transform)'`
-default/couchdb: default/couchdb.tpl
- if test "$(mkdir_p)"; then \
- $(mkdir_p) default; \
- else \
- if test ! -d default; then \
- mkdir default; \
- fi \
- fi
- sed -e "s|%configure_input%|$@. Generated from $< by configure.|" \
- -e "s|%localconfdir%|$(localconfdir)|g" \
- -e "s|%sysconfdir%|$(sysconfdir)|" \
- -e "s|%localstatedir%|$(localstatedir)|" \
- < $< > $@
-
init/couchdb: init/couchdb.tpl
if test "$(mkdir_p)"; then \
$(mkdir_p) init; \
Propchange: incubator/couchdb/trunk/etc/default/couchdb
------------------------------------------------------------------------------
svn:mergeinfo =