diff options
| author | Paul Joseph Davis <davisp@apache.org> | 2009-11-09 00:39:16 +0000 |
|---|---|---|
| committer | Paul Joseph Davis <davisp@apache.org> | 2009-11-09 00:39:16 +0000 |
| commit | e29a1924afe9e6051369f7bcbf44ccdf53de536a (patch) | |
| tree | e9511858c1ca8faf7b051c38b712982cb051caba /utils | |
| parent | c114565bff170785c1352142dc1a28557a91dd97 (diff) | |
Fixes 'make distcheck' to run the test suite.
Quite a few changes to the build system to handle VPATH builds appropriately as well as make the test suite know about them.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@833951 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/Makefile.am | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/utils/Makefile.am b/utils/Makefile.am index 65fd1a81..379c1eb0 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -20,17 +20,18 @@ couchdb_command_name = `echo couchdb | sed '$(transform)'` 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|%bindir%|$(abs_top_builddir)/bin|g" \ -e "s|%defaultini%|default_dev.ini|g" \ -e "s|%localini%|local_dev.ini|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" \ - -e "s|%localstatedir%|$(abs_top_srcdir)/tmp|g" \ + -e "s|%localerlanglibdir%|foo \ + -pa $(abs_top_builddir)\/src\/couchdb \ + -pa $(abs_top_builddir)\/src\/erlang-oauth \ + -pa $(abs_top_builddir)\/src\/ibrowse \ + -pa $(abs_top_builddir)\/src\/mochiweb|g" \ + -e "s|%localconfdir%|$(abs_top_builddir)/etc/couchdb|g" \ + -e "s|%localstatelogdir%|$(abs_top_builddir)/tmp/log|g" \ + -e "s|%localstatelibdir%|$(abs_top_builddir)/tmp/lib|g" \ + -e "s|%localstatedir%|$(abs_top_builddir)/tmp|g" \ -e "s|%bug_uri%|@bug_uri@|g" \ -e "s|%package_author_address%|@package_author_address@|g" \ -e "s|%package_author_name%|@package_author_name@|g" \ |