From 905259a8a1a319245630e4aa556b01d91a87ae68 Mon Sep 17 00:00:00 2001 From: hkernbach Date: Wed, 29 Mar 2017 16:54:48 +0200 Subject: [PATCH] fixed bundle mac build --- Installation/MacOSX/Bundle/arangodb-cli.sh.in | 2 +- cmake/packages/bundle.cmake | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Installation/MacOSX/Bundle/arangodb-cli.sh.in b/Installation/MacOSX/Bundle/arangodb-cli.sh.in index 6c63a6e03078..dbc658808d8d 100755 --- 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 index bc1ddd83db6b..fdbd70bc02a6 100644 --- 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")