[21/37] couchdb commit: updated refs/heads/master to 1ef7182

[ja...@apache.org]

fix --databasedir and --viewdir


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/1cf49ade
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/1cf49ade
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/1cf49ade

Branch: refs/heads/master
Commit: 1cf49ade9c03cc93ece9eeb9e7979e9d2603012b
Parents: dfa358a
Author: Jan Lehnardt <ja...@apache.org>
Authored: Tue Jun 23 22:41:24 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:07:02 2015 +0200

----------------------------------------------------------------------
 configure | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/1cf49ade/configure
----------------------------------------------------------------------
diff --git a/configure b/configure
index c3f0f3c..fe8e925 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"}.