Merge branch 'pipeline' of github.com:arangodb/ArangoDB into devel

Installation/Jenkins/build.sh

@@ -323,7 +323,7 @@ fi
 
 if [ ! -f Makefile -o ! -f CMakeCache.txt ];  then
     CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \
-          cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DVARDIR=/var ${CONFIGURE_OPTIONS} ${MAINTAINER_MODE} -G "${GENERATOR}"
+          cmake .. -DCMAKE_INSTALL_PREFIX=/ -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DVARDIR=/var ${CONFIGURE_OPTIONS} ${MAINTAINER_MODE} -G "${GENERATOR}"
 fi
 
 ${MAKE_CMD_PREFIX} ${MAKE} ${VERBOSE_MAKE} "${PAR}" "${PARALLEL_BUILDS}" ${MAKE_PARAMS}

Installation/rpm/arangodb.service

@@ -0,0 +1,36 @@
+# This file is part of package arangodb.
+#
+# Description:
+#
+#  Used to start ArangoDB
+#
+#  A universal open-source database with a flexible data model 
+#  for documents, graphs, and key-values. Build high 
+#  performance applications using a convenient sql-like query 
+#  language or JavaScript extensions.
+#
+#  http://www.arangodb.com
+#
+
+[Unit]
+Description=ArangoDB
+After=syslog.target network.target
+
+[Service]
+Type=simple
+LimitNOFILE=131072
+PIDFile=/var/run/arangodb/arangod.pid
+ExecStartPre=/usr/bin/install -g arangodb -o arangodb -d /var/run/arangodb
+ExecStartPre=/usr/bin/chown -R arangodb:arangodb /var/log/arangodb3
+ExecStartPre=/usr/bin/chmod 700 /var/log/arangodb3
+ExecStartPre=/usr/bin/chown -R arangodb:arangodb /var/lib/arangodb3
+ExecStartPre=/usr/bin/chmod 700 /var/lib/arangodb3
+ExecStartPre=/usr/bin/chown -R arangodb:arangodb /var/lib/arangodb3-apps
+ExecStartPre=/usr/bin/chmod 700 /var/lib/arangodb3-apps
+ExecStartPre=/usr/sbin/arangod --uid arangodb --gid arangodb --pid-file /var/run/arangodb/arangod.pid --server.rest-server false --database.auto-upgrade true
+ExecStart=/usr/sbin/arangod --uid arangodb --gid arangodb --pid-file /var/run/arangodb/arangod.pid
+TimeoutStopSec=120
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target

cmake/ArangoDBInstall.cmake

@@ -28,7 +28,7 @@ include(InstallMacros)
 
 # install ----------------------------------------------------------------------
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/Documentation/man/
-  DESTINATION share/man)
+  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/man)
 
 install_readme(README README.txt)
 install_readme(README.md README.md)
@@ -50,7 +50,7 @@ include(InstallArangoDBJSClient)
 
 install(
   DIRECTORY ${PROJECT_SOURCE_DIR}/js/actions ${PROJECT_SOURCE_DIR}/js/apps ${PROJECT_SOURCE_DIR}/js/contrib ${PROJECT_SOURCE_DIR}/js/node ${PROJECT_SOURCE_DIR}/js/server
-  DESTINATION share/arangodb3/js
+  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR_ARANGO}/js
   REGEX "^.*/server/tests$" EXCLUDE
   REGEX "^.*/aardvark/APP/node_modules$" EXCLUDE
 )

cmake/InstallArangoDBJSClient.cmake

@@ -4,7 +4,7 @@
 
 install(
   DIRECTORY ${ARANGODB_SOURCE_DIR}/js/common ${ARANGODB_SOURCE_DIR}/js/client 
-  DESTINATION share/arangodb3/js
+  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR_ARANGO}/js
   FILES_MATCHING PATTERN "*.js"
   REGEX "^.*/common/test-data$" EXCLUDE
   REGEX "^.*/common/tests$" EXCLUDE

cmake/InstallMacros.cmake

@@ -61,7 +61,7 @@ macro (install_config name)
   endif ()
   install(
     FILES ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_SYSCONFDIR_ARANGO}/${name}.conf
-    DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR_ARANGO})
+    DESTINATION ${CMAKE_INSTALL_SYSCONFDIR_ARANGO})
 endmacro ()
 
 # installs a readme file converting EOL ----------------------------------------

cmake/packages/packages.cmake

@@ -1,4 +1,4 @@
-if (NOT(MSVC) AND NOT  ("${PACKAGING}" STREQUAL "RPM"))
+if (NOT(MSVC))
   set(CPACK_SET_DESTDIR ON)
 endif()