fixed bundle mac build

dim123 · Mar 29, 2017 · 905259a · 905259a
1 parent bbbf4ea
commit 905259a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Installation/MacOSX/Bundle/arangodb-cli.sh.in b/Installation/MacOSX/Bundle/arangodb-cli.sh.in
@@ -17,7 +17,7 @@ for script in $SCRIPTS; do
     echo "export ROOTDIR=\"${ROOTDIR}@CMAKE_INSTALL_PREFIX@\""
     echo
 
-    echo "exec \"\${ROOTDIR}/$script\" -c \"\${ROOTDIR}@CMAKE_INSTALL_SYSCONFDIR_ARANGO@/${base}.conf\" \$*"
+    echo "exec \"\${ROOTDIR}/$script\" -c \"\${ROOTDIR}/@CMAKE_INSTALL_SYSCONFDIR_ARANGO@/${base}.conf\" \$*"
   ) > ${ROOTDIR}/$base.$$
 
   chmod 755 ${ROOTDIR}/$base.$$

diff --git a/cmake/packages/bundle.cmake b/cmake/packages/bundle.cmake
@@ -20,10 +20,9 @@ set(CPACK_ARANGO_DATA_DIR "${INST_USR_LIBDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INS
 set(CPACK_ARANGO_LOG_DIR "${INST_USR_LIBDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LOCALSTATEDIR}/log/arangodb3")
 set(CPACK_ARANGO_STATE_DIR "${INST_USR_LIBDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LOCALSTATEDIR}")
 
-set(CPACK_ARANGODB_APPS_DIRECTORY "${INST_USR_LIBDIR}${ARANGODB_APPS_DIRECTORY}")
+set(CPACK_ARANGODB_APPS_DIRECTORY "${INST_USR_LIBDIR}/opt/arangodb${ARANGODB_APPS_DIRECTORY}")
 
 to_native_path("CPACK_ARANGODB_APPS_DIRECTORY")
-message("CPACK_ARANGODB_APPS_DIRECTORY: ${CPACK_ARANGODB_APPS_DIRECTORY} INC_CPACK_ARANGODB_APPS_DIRECTORY: ${INC_CPACK_ARANGODB_APPS_DIRECTORY} ARANGODB_APPS_DIRECTORY ${ARANGODB_APPS_DIRECTORY}")
 to_native_path("CMAKE_INSTALL_DATAROOTDIR_ARANGO")
 to_native_path("CPACK_ARANGO_PID_DIR")
 to_native_path("CPACK_ARANGO_DATA_DIR")