diff options
| author | Noah Slater <nslater@apache.org> | 2008-09-11 19:42:14 +0000 |
|---|---|---|
| committer | Noah Slater <nslater@apache.org> | 2008-09-11 19:42:14 +0000 |
| commit | 4ab53044a63d1e55bf53ee74ad6aa3db162f0aa5 (patch) | |
| tree | 37678b443017349a00f31b7c10c0b02dff3f93f1 | |
| parent | 6a652aa8be8d7c1e01463d04a6b31e5f6d90196e (diff) | |
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
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | etc/Makefile.am | 14 | ||||
| -rw-r--r-- | etc/default/couchdb (renamed from etc/default/couchdb.tpl.in) | 0 |
3 files changed, 0 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index bf6d948a..48b80ec8 100644 --- a/configure.ac +++ b/configure.ac @@ -233,7 +233,6 @@ AC_CONFIG_FILES([bin/couchdb.tpl]) 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]) 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.tpl.in b/etc/default/couchdb index c2a3f2ae..c2a3f2ae 100644 --- a/etc/default/couchdb.tpl.in +++ b/etc/default/couchdb |