summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Lehnardt <jan@apache.org>2015-06-23 22:41:24 +0200
committerJan Lehnardt <jan@apache.org>2015-06-24 23:07:02 +0200
commit1cf49ade9c03cc93ece9eeb9e7979e9d2603012b (patch)
treedfa0f038b3bd8e873639457b9f41152b5d3f7791
parentdfa358a9faef75aa5a5834268573ef74d01b15c1 (diff)
downloadcouchdb-1cf49ade9c03cc93ece9eeb9e7979e9d2603012b.tar.gz
fix --databasedir and --viewdir
-rwxr-xr-xconfigure11
1 files changed, 4 insertions, 7 deletions
diff --git a/configure b/configure
index c3f0f3c59..fe8e92580 100755
--- a/configure
+++ b/configure
@@ -416,12 +416,9 @@ fi
# Translate ./configure variables to CouchDB variables
-INSTALL_DIR=$LIBDIR/couchdb
+INSTALLDIR=$LIBDIR/couchdb
LOG_FILE=$LOGDIR/couch.log
-DATBASE_DIR=$DATABASE_DIR/couchdb
-VIEW_DIR=$VIEW_DIR/couchdb
-
echo "==> configuring couchdb in rel/couchdb.config"
cat > rel/couchdb.config << EOF
@@ -440,9 +437,9 @@ cat > rel/couchdb.config << EOF
% The contents of this file are auto-generated by configure
%
{package_author_name, "$PACKAGE_AUTHOR_NAME"}.
-{prefix, "$INSTALL_DIR"}.
-{data_dir, "$DATABASE_DIR"}.
-{view_index_dir, "$VIEW_DIR"}.
+{prefix, "$INSTALLDIR"}.
+{data_dir, "$DATABASEDIR"}.
+{view_index_dir, "$VIEWDIR"}.
{log_file, "$LOG_FILE"}.
{user, "$COUCHDB_USER"}.
{node_name, "-name couchdb"}.