removed --enable-install-dbdir

Makefile.am

@@ -245,17 +245,6 @@ nobase_pkgdata_DATA += \
 
 endif
 
-################################################################################
-### @brief /var data
-################################################################################
-
-if ENABLE_INSTALL_DBDIR
-
-install-data-local:
-	test -d $(DESTDIR)$(TRI_DATABASEDIR) || mkdir -p $(DESTDIR)$(TRI_DATABASEDIR)
-
-endif
-
 ## -----------------------------------------------------------------------------
 ## --SECTION--                                                           TARGETS
 ## -----------------------------------------------------------------------------

Makefile.in

@@ -5158,7 +5158,6 @@ maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-@ENABLE_INSTALL_DBDIR_FALSE@install-data-local:
 clean: clean-am
 
 clean-am: clean-binPROGRAMS clean-generic clean-local \
@@ -5184,8 +5183,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-arangosysconfDATA install-data-local \
+install-data-am: install-arangosysconfDATA install-nobase_pkgdataDATA
-	install-nobase_pkgdataDATA
 
 install-dvi: install-dvi-am
 
@@ -5246,25 +5244,18 @@ uninstall-am: uninstall-arangosysconfDATA uninstall-binPROGRAMS \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-arangosysconfDATA install-binPROGRAMS install-data \
-	install-data-am install-data-local install-dvi install-dvi-am \
+	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec install-exec-am install-html install-html-am \
+	install-exec-am install-html install-html-am install-info \
-	install-info install-info-am install-man \
+	install-info-am install-man install-nobase_pkgdataDATA \
-	install-nobase_pkgdataDATA install-pdf install-pdf-am \
+	install-pdf install-pdf-am install-ps install-ps-am \
-	install-ps install-ps-am install-sbinPROGRAMS install-strip \
+	install-sbinPROGRAMS install-strip installcheck \
-	installcheck installcheck-am installdirs maintainer-clean \
+	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
 	uninstall-am uninstall-arangosysconfDATA uninstall-binPROGRAMS \
 	uninstall-nobase_pkgdataDATA uninstall-sbinPROGRAMS
 
 
-################################################################################
-### @brief /var data
-################################################################################
-
-@ENABLE_INSTALL_DBDIR_TRUE@install-data-local:
-@ENABLE_INSTALL_DBDIR_TRUE@	test -d $(DESTDIR)$(TRI_DATABASEDIR) || mkdir -p $(DESTDIR)$(TRI_DATABASEDIR)
-
 ################################################################################
 ### @brief version number
 ################################################################################

configure

@@ -758,8 +758,6 @@ build_cpu
 build
 ENABLE_RELATIVE_FALSE
 ENABLE_RELATIVE_TRUE
-ENABLE_INSTALL_DBDIR_FALSE
-ENABLE_INSTALL_DBDIR_TRUE
 ENABLE_ALL_IN_ONE_V8_FALSE
 ENABLE_ALL_IN_ONE_V8_TRUE
 ENABLE_ALL_IN_ONE_PROTOBUF_FALSE
@@ -817,7 +815,6 @@ enable_all_in_one_boost
 enable_all_in_one_libev
 enable_all_in_one_protobuf
 enable_all_in_one_v8
-enable_install_dbdir
 enable_relative
 enable_silent_rules
 enable_dependency_tracking
@@ -1501,7 +1498,6 @@ Optional Features:
   --enable-all-in-one-protobuf
                           use supplied PROTOBUF from 3rdParty directory
   --enable-all-in-one-v8  use supplied V8 from 3rdParty directory
-  --enable-install-dbdir  install an empty database directory
   --enable-relative       all path are relative to the binary (default: no)
   --enable-silent-rules          less verbose build output (undo: `make V=1')
   --disable-silent-rules         verbose build output (undo: `make V=0')
@@ -2687,25 +2683,6 @@ fi
 
 
 
-# Check whether --enable-install-dbdir was given.
-if test "${enable_install_dbdir+set}" = set; then :
-  enableval=$enable_install_dbdir; tr_DBDIR="${enableval:-yes}"
-else
-  tr_DBDIR=yes
-
-fi
-
-
- if test "x$tr_DBDIR" = xyes; then
-  ENABLE_INSTALL_DBDIR_TRUE=
-  ENABLE_INSTALL_DBDIR_FALSE='#'
-else
-  ENABLE_INSTALL_DBDIR_TRUE='#'
-  ENABLE_INSTALL_DBDIR_FALSE=
-fi
-
-
-
 # Check whether --enable-relative was given.
 if test "${enable_relative+set}" = set; then :
   enableval=$enable_relative; tr_RELATIVE="${enableval:-yes}"
@@ -10131,10 +10108,6 @@ if test -z "${ENABLE_ALL_IN_ONE_V8_TRUE}" && test -z "${ENABLE_ALL_IN_ONE_V8_FAL
   as_fn_error $? "conditional \"ENABLE_ALL_IN_ONE_V8\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${ENABLE_INSTALL_DBDIR_TRUE}" && test -z "${ENABLE_INSTALL_DBDIR_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_INSTALL_DBDIR\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${ENABLE_RELATIVE_TRUE}" && test -z "${ENABLE_RELATIVE_FALSE}"; then
   as_fn_error $? "conditional \"ENABLE_RELATIVE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5

configure.ac

@@ -92,18 +92,6 @@ dnl ============================================================================
 dnl --SECTION--                                                          OPTIONS
 dnl ============================================================================
 
-dnl ----------------------------------------------------------------------------
-dnl INSTALL EMPTY DATABASE
-dnl ----------------------------------------------------------------------------
-
-AC_ARG_ENABLE(install-dbdir,
-  AS_HELP_STRING([--enable-install-dbdir], [install an empty database directory]),
-  [tr_DBDIR="${enableval:-yes}"],
-  [tr_DBDIR=yes]
-)
-
-AM_CONDITIONAL(ENABLE_INSTALL_DBDIR, test "x$tr_DBDIR" = xyes)
-
 dnl ----------------------------------------------------------------------------
 dnl RELATIVE PATH
 dnl ----------------------------------------------------------------------------