summaryrefslogtreecommitdiff
path: root/src/couchdb
diff options
context:
space:
mode:
authorPaul Joseph Davis <davisp@apache.org>2009-11-09 00:39:16 +0000
committerPaul Joseph Davis <davisp@apache.org>2009-11-09 00:39:16 +0000
commite29a1924afe9e6051369f7bcbf44ccdf53de536a (patch)
treee9511858c1ca8faf7b051c38b712982cb051caba /src/couchdb
parentc114565bff170785c1352142dc1a28557a91dd97 (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 'src/couchdb')
-rw-r--r--src/couchdb/priv/Makefile.am9
-rw-r--r--src/couchdb/priv/stat_descriptions.cfg.in (renamed from src/couchdb/priv/stat_descriptions.cfg)0
2 files changed, 8 insertions, 1 deletions
diff --git a/src/couchdb/priv/Makefile.am b/src/couchdb/priv/Makefile.am
index 8c504dbc..fecaa64b 100644
--- a/src/couchdb/priv/Makefile.am
+++ b/src/couchdb/priv/Makefile.am
@@ -13,11 +13,18 @@
couchlibdir = $(localerlanglibdir)/couch-$(version)
couchprivdir = $(couchlibdir)/priv
-EXTRA_DIST = couchspawnkillable.sh stat_descriptions.cfg
+EXTRA_DIST = \
+ couchspawnkillable.sh \
+ stat_descriptions.cfg.in
+
+CLEANFILES = stat_descriptions.cfg
couchpriv_DATA = stat_descriptions.cfg
couchpriv_PROGRAMS = couchspawnkillable
+%.cfg: %.cfg.in
+ cp $< $@
+
if WINDOWS
couchspawnkillable_SOURCES = couchspawnkillable_win.c
endif
diff --git a/src/couchdb/priv/stat_descriptions.cfg b/src/couchdb/priv/stat_descriptions.cfg.in
index 91a1540f..91a1540f 100644
--- a/src/couchdb/priv/stat_descriptions.cfg
+++ b/src/couchdb/priv/stat_descriptions.cfg.in