summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorNoah Slater <nslater@apache.org>2008-04-14 23:29:47 +0000
committerNoah Slater <nslater@apache.org>2008-04-14 23:29:47 +0000
commitcb0a48ce99e38dc1fc69a72ad901e38dcfc09e87 (patch)
treea4dfa287fb73d58284dcef29e918ee60e494d92d /etc
parentd33da1df789a4842269cb0945697320c1ff9d596 (diff)
moved couchjs_command_name to correct Makefile.am
git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@648054 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'etc')
-rw-r--r--etc/Makefile.am1
-rw-r--r--etc/couchdb/Makefile.am3
2 files changed, 3 insertions, 1 deletions
diff --git a/etc/Makefile.am b/etc/Makefile.am
index e5a93fab..743f9f40 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -33,7 +33,6 @@ CLEANFILES = $(init_DATA) $(nobase_sysconf_DATA) $(launchd_DATA)
transform = @program_transform_name@
couchdb_command_name = `echo couchdb | sed '$(transform)'`
-couchjs_command_name = `echo couchjs | sed '$(transform)'`
default/couchdb: default/couchdb.tpl
if test "$(mkdir_p)"; then \
diff --git a/etc/couchdb/Makefile.am b/etc/couchdb/Makefile.am
index 2835b9a9..aef244b6 100644
--- a/etc/couchdb/Makefile.am
+++ b/etc/couchdb/Makefile.am
@@ -18,6 +18,9 @@ nobase_dist_pkgconf_DATA = conf/mime.types
CLEANFILES = $(pkgconf_DATA) $(dist_pkgconf_DATA)
+transform = @program_transform_name@
+couchjs_command_name = `echo couchjs | sed '$(transform)'`
+
couch.ini: couch.ini.tpl
sed -e "s|%bindir%|@bindir@|g" \
-e "s|%pkgconfdir%|@pkgconfdir@|g" \