diff options
| author | Jan Lehnardt <jan@apache.org> | 2008-08-20 13:55:41 +0000 |
|---|---|---|
| committer | Jan Lehnardt <jan@apache.org> | 2008-08-20 13:55:41 +0000 |
| commit | 2bc4be3dbf9e8ea3b67c62f2d99087ff4b43c17b (patch) | |
| tree | 9a961f6f3fb0acbd9d34abef40492bbe95cc3d94 /configure.ac | |
| parent | ad6fd47a1f13e8d09eb5864c50e102825e28b75c (diff) | |
Merge runtimeconfig branch back into trunk
git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@687336 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index b82edf34..bf6d948a 100644 --- a/configure.ac +++ b/configure.ac @@ -232,7 +232,7 @@ AC_CONFIG_FILES([bin/couchjs.tpl]) AC_CONFIG_FILES([bin/couchdb.tpl]) AC_CONFIG_FILES([bin/Makefile]) AC_CONFIG_FILES([etc/couchdb/Makefile]) -AC_CONFIG_FILES([etc/couchdb/couch.ini.tpl]) +AC_CONFIG_FILES([etc/couchdb/default.ini.tpl]) AC_CONFIG_FILES([etc/default/couchdb.tpl]) AC_CONFIG_FILES([etc/default/Makefile]) AC_CONFIG_FILES([etc/init/couchdb.tpl]) @@ -246,12 +246,12 @@ AC_CONFIG_FILES([share/Makefile]) AC_CONFIG_FILES([src/couchdb/couch.app.tpl]) AC_CONFIG_FILES([src/couchdb/Makefile]) AC_CONFIG_FILES([src/mochiweb/Makefile]) -AC_CONFIG_FILES([src/Makefile]) +AC_CONFIG_FILES([test/Makefile]) AC_CONFIG_FILES([var/Makefile]) AC_OUTPUT echo -echo "You have configured Apache CouchDB. Time to relax." +echo "You have configured Apache CouchDB, time to relax." echo echo "Run \`make && make install' to install." |