From 4ab53044a63d1e55bf53ee74ad6aa3db162f0aa5 Mon Sep 17 00:00:00 2001
From: Noah Slater <nslater@apache.org>
Date: Thu, 11 Sep 2008 19:42:14 +0000
Subject: removed make packaging of etc/default/couchdb

git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@694441 13f79535-47bb-0310-9956-ffa450edef68
---
 etc/Makefile.am            | 14 --------------
 etc/default/couchdb        |  7 +++++++
 etc/default/couchdb.tpl.in |  7 -------
 3 files changed, 7 insertions(+), 21 deletions(-)
 create mode 100644 etc/default/couchdb
 delete mode 100644 etc/default/couchdb.tpl.in

(limited to 'etc')

diff --git a/etc/Makefile.am b/etc/Makefile.am
index ecbe47bc..2711afdb 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -30,20 +30,6 @@ CLEANFILES = $(init_DATA) $(nobase_sysconf_DATA) $(launchd_DATA)
 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; \
diff --git a/etc/default/couchdb b/etc/default/couchdb
new file mode 100644
index 00000000..c2a3f2ae
--- /dev/null
+++ b/etc/default/couchdb
@@ -0,0 +1,7 @@
+# Sourced by init script for configuration.
+
+COUCHDB_USER=couchdb
+COUCHDB_STDOUT_FILE=/dev/null
+COUCHDB_STDERR_FILE=/dev/null
+COUCHDB_RESPAWN_TIMEOUT=5
+COUCHDB_OPTIONS=
diff --git a/etc/default/couchdb.tpl.in b/etc/default/couchdb.tpl.in
deleted file mode 100644
index c2a3f2ae..00000000
--- a/etc/default/couchdb.tpl.in
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sourced by init script for configuration.
-
-COUCHDB_USER=couchdb
-COUCHDB_STDOUT_FILE=/dev/null
-COUCHDB_STDERR_FILE=/dev/null
-COUCHDB_RESPAWN_TIMEOUT=5
-COUCHDB_OPTIONS=
-- 
cgit v1.2.3