Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

install only system, do not create directory

This commit is contained in:
Frank Celler 2013-11-23 13:55:37 +01:00
parent 5a867e7392
commit 55c033ef93
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -254,7 +254,7 @@ nobase_pkgdata_DATA = \
$(shell find @srcdir@/js/client -name "*.js" -print) \
$(shell find @srcdir@/js/node -type f -print) \
$(shell find @srcdir@/js/npm -type f "(" -name .travis.yml -o -name .npmignore -o -print ")") \
$(shell find @srcdir@/js/apps -type f -print)
$(shell find @srcdir@/js/apps/system -type f -print)
if ENABLE_MRUBY

2
Makefile.in
View File

@ -1287,7 +1287,7 @@ nobase_pkgdata_DATA = $(shell find @srcdir@/js/actions -name "*.js" \
find @srcdir@/js/client -name "*.js" -print) $(shell find \
@srcdir@/js/node -type f -print) $(shell find @srcdir@/js/npm \
-type f "(" -name .travis.yml -o -name .npmignore -o -print \
")") $(shell find @srcdir@/js/apps -type f -print) \
")") $(shell find @srcdir@/js/apps/system -type f -print) \
$(am__append_7)
lib_libarango_a_CPPFLAGS = \
$(AM_CPPFLAGS)

6
arangod/VocBase/server.c
View File

@ -1862,17 +1862,23 @@ int TRI_StartServer (TRI_server_t* server,
// create subdirectories if not yet present
res = CreateBaseApplicationDirectory(server->_appPath, "databases");
// system directory is in a read-only location
#if 0
if (res == TRI_ERROR_NO_ERROR) {
res = CreateBaseApplicationDirectory(server->_appPath, "system");
}
#endif
if (res == TRI_ERROR_NO_ERROR) {
res = CreateBaseApplicationDirectory(server->_devAppPath, "databases");
}
// system directory is in a read-only location
#if 0
if (res == TRI_ERROR_NO_ERROR) {
res = CreateBaseApplicationDirectory(server->_devAppPath, "system");
}
#endif
if (res != TRI_ERROR_NO_ERROR) {
LOG_ERROR("unable to initialise databases: %s",