From 53968ddfd93bfe1aa403478de715ae0ac77db177 Mon Sep 17 00:00:00 2001 From: Noah Slater Date: Tue, 15 Apr 2008 00:47:45 +0000 Subject: moved couchprivlibdir to the correct makefile git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@648081 13f79535-47bb-0310-9956-ffa450edef68 --- etc/Makefile.am | 2 -- etc/couchdb/Makefile.am | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/Makefile.am b/etc/Makefile.am index 743f9f40..13052665 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -12,8 +12,6 @@ datarootdir = @prefix@/share -couchprivlibdir = $(erlanglibdir)/couch-$(version)/priv/lib - SUBDIRS = couchdb default init launchd logrotate.d default_sysconf_data = logrotate.d/couchdb diff --git a/etc/couchdb/Makefile.am b/etc/couchdb/Makefile.am index aef244b6..981b1cc8 100644 --- a/etc/couchdb/Makefile.am +++ b/etc/couchdb/Makefile.am @@ -21,6 +21,8 @@ CLEANFILES = $(pkgconf_DATA) $(dist_pkgconf_DATA) transform = @program_transform_name@ couchjs_command_name = `echo couchjs | sed '$(transform)'` +couchprivlibdir = $(erlanglibdir)/couch-$(version)/priv/lib + couch.ini: couch.ini.tpl sed -e "s|%bindir%|@bindir@|g" \ -e "s|%pkgconfdir%|@pkgconfdir@|g" \ -- cgit v1.2.3