summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Kocoloski <kocolosk@apache.org>2009-08-30 21:21:40 +0000
committerAdam Kocoloski <kocolosk@apache.org>2009-08-30 21:21:40 +0000
commitc525df6ee69dc4c266f3d6e0e00bcf76fbf3af47 (patch)
tree9cd658b210280ab31cf6ba30544d56d42c5bb832
parent7b1019a1e1a8d79f7448e78bf76125f1c57eca53 (diff)
utils/run hack, source tree is incompatible w/ ERL_LIBS. See COUCHDB-216
Also cleaned up some obsolete automake variables git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@809419 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--bin/Makefile.am4
-rw-r--r--utils/Makefile.am10
2 files changed, 4 insertions, 10 deletions
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 93a53192..f7eb2697 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -33,10 +33,6 @@ couchdb: couchdb.tpl
-e "s|%ICU_CONFIG%|$(ICU_CONFIG)|g" \
-e "s|%bindir%|@bindir@|g" \
-e "s|%localerlanglibdir%|@localerlanglibdir@|g" \
- -e "s|%couchdbebindir%|couch-@version@/ebin|g" \
- -e "s|%mochiwebebindir%|mochiweb-r97/ebin|g" \
- -e "s|%ibrowseebindir%|ibrowse-1.5.2/ebin|g" \
- -e "s|%oauthebindir%|erlang-oauth/ebin|g" \
-e "s|%defaultini%|default.ini|g" \
-e "s|%localini%|local.ini|g" \
-e "s|%localconfdir%|@localconfdir@|g" \
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 6ac49511..65fd1a81 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -21,14 +21,12 @@ run: ../bin/couchdb.tpl
sed -e "s|%ERL%|$(ERL)|g" \
-e "s|%ICU_CONFIG%|$(ICU_CONFIG)|g" \
-e "s|%bindir%|$(abs_top_srcdir)/bin|g" \
- -e "s|%localerlanglibdir%|$(abs_top_srcdir)/src|g" \
- -e "s|%mochiwebebindir%|mochiweb|g" \
- -e "s|%couchdbebindir%|couchdb|g" \
- -e "s|%ibrowseebindir%|ibrowse|g" \
- -e "s|%oauthebindir%|erlang-oauth|g" \
-e "s|%defaultini%|default_dev.ini|g" \
-e "s|%localini%|local_dev.ini|g" \
- -e "s|%localerlanglibdir%|$(abs_top_srcdir)/src|g" \
+ -e "s|%localerlanglibdir%|foo -pa $(abs_top_srcdir)\/src\/couchdb \
+ -pa $(abs_top_srcdir)\/src\/erlang-oauth \
+ -pa $(abs_top_srcdir)\/src\/ibrowse \
+ -pa $(abs_top_srcdir)\/src\/mochiweb|g" \
-e "s|%localconfdir%|$(abs_top_srcdir)/etc/couchdb|g" \
-e "s|%localstatelogdir%|$(abs_top_srcdir)/tmp/log|g" \
-e "s|%localstatelibdir%|$(abs_top_srcdir)/tmp/lib|g" \