Return-Path: Delivered-To: apmail-incubator-couchdb-commits-archive@locus.apache.org Received: (qmail 39009 invoked from network); 11 Sep 2008 19:43:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 11 Sep 2008 19:43:15 -0000 Received: (qmail 5302 invoked by uid 500); 11 Sep 2008 19:43:13 -0000 Delivered-To: apmail-incubator-couchdb-commits-archive@incubator.apache.org Received: (qmail 5284 invoked by uid 500); 11 Sep 2008 19:43:13 -0000 Mailing-List: contact couchdb-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: couchdb-dev@incubator.apache.org Delivered-To: mailing list couchdb-commits@incubator.apache.org Received: (qmail 5275 invoked by uid 99); 11 Sep 2008 19:43:13 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Sep 2008 12:43:13 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Sep 2008 19:42:13 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D85422388970; Thu, 11 Sep 2008 12:42:15 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r694441 - in /incubator/couchdb/trunk: configure.ac etc/Makefile.am etc/default/couchdb etc/default/couchdb.tpl.in Date: Thu, 11 Sep 2008 19:42:15 -0000 To: couchdb-commits@incubator.apache.org From: nslater@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080911194215.D85422388970@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 =