From 39de3072bcf9fdeec6d3faeb125924c401242205 Mon Sep 17 00:00:00 2001 From: Christopher Lenz Date: Tue, 15 Apr 2008 12:21:00 +0000 Subject: Merged mochiweb branch back into trunk. git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@648222 13f79535-47bb-0310-9956-ffa450edef68 --- etc/couchdb/Makefile.am | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'etc/couchdb/Makefile.am') diff --git a/etc/couchdb/Makefile.am b/etc/couchdb/Makefile.am index 981b1cc8..690bbb01 100644 --- a/etc/couchdb/Makefile.am +++ b/etc/couchdb/Makefile.am @@ -12,11 +12,9 @@ datarootdir = @prefix@/share -pkgconf_DATA = couch.ini couch_httpd.conf +pkgconf_DATA = couch.ini -nobase_dist_pkgconf_DATA = conf/mime.types - -CLEANFILES = $(pkgconf_DATA) $(dist_pkgconf_DATA) +CLEANFILES = $(pkgconf_DATA) transform = @program_transform_name@ couchjs_command_name = `echo couchjs | sed '$(transform)'` @@ -32,10 +30,3 @@ couch.ini: couch.ini.tpl -e "s|%couchprivlibdir%|$(couchprivlibdir)|g" \ -e "s|%couchjs_command_name%|$(couchjs_command_name)|g" \ < $< > $@ - -couch_httpd.conf: couch_httpd.conf.tpl - sed -e "s|%pkgconfdir%|@pkgconfdir@|g" \ - -e "s|%pkgdatadir%|@pkgdatadir@|g" \ - -e "s|%pkgstatelogdir%|@pkgstatelogdir@|g" \ - < $< > $@ - -- cgit v1.2.3