couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kocol...@apache.org
Subject svn commit: r809419 - in /couchdb/trunk: bin/Makefile.am utils/Makefile.am
Date Sun, 30 Aug 2009 21:21:42 GMT
Author: kocolosk
Date: Sun Aug 30 21:21:40 2009
New Revision: 809419

URL: http://svn.apache.org/viewvc?rev=809419&view=rev
Log:
utils/run hack, source tree is incompatible w/ ERL_LIBS.  See COUCHDB-216

Also cleaned up some obsolete automake variables

Modified:
    couchdb/trunk/bin/Makefile.am
    couchdb/trunk/utils/Makefile.am

Modified: couchdb/trunk/bin/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/trunk/bin/Makefile.am?rev=809419&r1=809418&r2=809419&view=diff
==============================================================================
--- couchdb/trunk/bin/Makefile.am (original)
+++ couchdb/trunk/bin/Makefile.am Sun Aug 30 21:21:40 2009
@@ -33,10 +33,6 @@
 	    -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" \

Modified: couchdb/trunk/utils/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/trunk/utils/Makefile.am?rev=809419&r1=809418&r2=809419&view=diff
==============================================================================
--- couchdb/trunk/utils/Makefile.am (original)
+++ couchdb/trunk/utils/Makefile.am Sun Aug 30 21:21:40 2009
@@ -21,14 +21,12 @@
 	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" \



Mime
View raw message