From c525df6ee69dc4c266f3d6e0e00bcf76fbf3af47 Mon Sep 17 00:00:00 2001 From: Adam Kocoloski Date: Sun, 30 Aug 2009 21:21:40 +0000 Subject: 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 --- utils/Makefile.am | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'utils/Makefile.am') 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" \ -- cgit v1.2.3