fixed Mac build

Conflicts: Makefile.in
2013-11-09 12:59:24 +01:00 · 2013-11-09 12:59:24 +01:00 · eee23de5e0
parent 6946f827fd
commit eee23de5e0
5 changed files with 34 additions and 24 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -111,8 +111,10 @@ set(ETCDIR "" CACHE path "System configuration directory (defaults to prefix/etc

 if (ETCDIR STREQUAL "")
  set(ETCDIR_NATIVE "${CMAKE_INSTALL_PREFIX}/etc/arangodb")
+  set(ETCDIR_INSTALL "etc/arangodb")
 else ()
  set(ETCDIR_NATIVE "${ETCDIR}/arangodb")
+  set(ETCDIR_INSTALL "${ETCDIR}/arangodb")
 endif ()

 file(TO_NATIVE_PATH "${ETCDIR_NATIVE}" ETCDIR_NATIVE)
@ -123,12 +125,14 @@ add_definitions("-D_SYSCONFDIR_=\"${ETCDIR_NATIVE}\"")
 ### @brief DATA DIRECTORY (/var)
 ################################################################################

-set(VARDIR "" CACHE path "System configuration directory (defaults to prefix/etc)")
+set(VARDIR "" CACHE path "System configuration directory (defaults to prefix/var/arangodb)")

 if (VARDIR STREQUAL "")
-  set(VARDIR_NATIVE "${CMAKE_INSTALL_PREFIX}/var/arangodb")
+  set(VARDIR_NATIVE "${CMAKE_INSTALL_PREFIX}/var")
+  set(VARDIR_INSTALL "var")
 else ()
-  set(VARDIR_NATIVE "${VARDIR}/arangodb")
+  set(VARDIR_NATIVE "${VARDIR}")
+  set(VARDIR_INSTALL "${VARDIR}")
 endif ()

 file(TO_NATIVE_PATH "${VARDIR_NATIVE}" VARDIR_NATIVE)
--- a/Makefile.am
+++ b/Makefile.am
@ -536,8 +536,6 @@ pack-dmg-cmake:
 	cd Build && cmake \
 		-D "BUILD_PACKAGE=dmg-cli" \
 		-D "CMAKE_INSTALL_PREFIX=${prefix}" \
-		-D "ETCDIR=${sysconfdir}" \
-		-D "VARDIR=${localstatedir}" \
 		-D "USE_MRUBY=ON" \
 		-D "USE_RAW_CONFIG=ON" \
 		-D "ARANGODB_VERSION=@VERSION@" \
@ -546,6 +544,10 @@ pack-dmg-cmake:
 		-D "CPACK_PACKAGE_VERSION_PATCH=${VERSION_PATCH}" \
 		..

+	${MAKE} ${BUILT_SOURCES}
+ 
+	cd Build && ${MAKE}
+
 	cd Build && cpack \
 		-G Bundle \
 		-D "CPACK_INSTALL_PREFIX=${DMG_NAME}/Contents/MacOS/opt/arangodb"
@ -587,6 +589,10 @@ pack-arm-cmake:
                -D "CMAKE_C_FLAGS_RELEASE:STRING=-O2 -DNDEBUG" \
 		..

+	${MAKE} ${BUILT_SOURCES}
+ 
+	cd Build && ${MAKE}
+
 	cd Build && cpack \
 		-G DEB

--- a/arangod/CMakeLists.txt
+++ b/arangod/CMakeLists.txt
@ -152,28 +152,28 @@ install(
 if (USE_RAW_CONFIG)
  install(
    FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod.conf.in
-    DESTINATION ${ETCDIR_NATIVE}
+    DESTINATION ${ETCDIR_INSTALL}
    RENAME arangod-relative.conf)
 endif ()

 if (BUILD_PACKAGE STREQUAL "raspbian")
  install(
    FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod-arm.conf
-    DESTINATION ${ETCDIR_NATIVE}
+    DESTINATION ${ETCDIR_INSTALL}
    RENAME arangod.conf)

  install(
    FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod-uid-arm.conf
-    DESTINATION ${ETCDIR_NATIVE}
+    DESTINATION ${ETCDIR_INSTALL}
    RENAME arangod-uid.conf)
 else ()
  install(
    FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod.conf
-    DESTINATION ${ETCDIR_NATIVE})
+    DESTINATION ${ETCDIR_INSTALL})

  install(
    FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod-uid.conf
-    DESTINATION ${ETCDIR_NATIVE})
+    DESTINATION ${ETCDIR_INSTALL})
 endif ()

 install(
@ -202,11 +202,11 @@ install(

 install(
  DIRECTORY ${PROJECT_BINARY_DIR}/var/log/arangodb
-  DESTINATION ${VARDIR_NATIVE}/log)
+  DESTINATION ${VARDIR_INSTALL}/log)

 install(
  DIRECTORY ${PROJECT_BINARY_DIR}/var/lib/arangodb
-  DESTINATION ${VARDIR_NATIVE}/lib)
+  DESTINATION ${VARDIR_INSTALL}/lib)

 ## -----------------------------------------------------------------------------
 ## --SECTION--                                                       END-OF-FILE
--- a/arangoirb/CMakeLists.txt
+++ b/arangoirb/CMakeLists.txt
@ -49,13 +49,13 @@ install(
 if (USE_RAW_CONFIG)
  install(
    FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangoirb.conf.in
-    DESTINATION ${ETCDIR_NATIVE}
+    DESTINATION ${ETCDIR_INSTALL}
    RENAME arangoirb-relative.conf)
 endif ()

 install(
  FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangoirb.conf
-  DESTINATION ${ETCDIR_NATIVE})
+  DESTINATION ${ETCDIR_INSTALL})

 install(
  DIRECTORY ${PROJECT_SOURCE_DIR}/mr/common ${PROJECT_SOURCE_DIR}/mr/client
--- a/arangosh/CMakeLists.txt
+++ b/arangosh/CMakeLists.txt
@ -46,13 +46,13 @@ install(
 if (USE_RAW_CONFIG)
  install(
    FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangob.conf.in
-    DESTINATION ${ETCDIR_NATIVE}
+    DESTINATION ${ETCDIR_INSTALL}
    RENAME arangob-relative.conf)
 endif ()

 install(
  FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangob.conf
-  DESTINATION ${ETCDIR_NATIVE})
+  DESTINATION ${ETCDIR_INSTALL})

 install(
  DIRECTORY ${PROJECT_SOURCE_DIR}/js/common ${PROJECT_SOURCE_DIR}/js/client
@ -91,13 +91,13 @@ install(
 if (USE_RAW_CONFIG)
  install(
    FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangodump.conf.in
-    DESTINATION ${ETCDIR_NATIVE}
+    DESTINATION ${ETCDIR_INSTALL}
    RENAME arangodump-relative.conf)
 endif ()

 install(
  FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangodump.conf
-  DESTINATION ${ETCDIR_NATIVE})
+  DESTINATION ${ETCDIR_INSTALL})

 install(
  DIRECTORY ${PROJECT_SOURCE_DIR}/js/common ${PROJECT_SOURCE_DIR}/js/client
@ -138,13 +138,13 @@ install(
 if (USE_RAW_CONFIG)
  install(
    FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangoimp.conf.in
-    DESTINATION ${ETCDIR_NATIVE}
+    DESTINATION ${ETCDIR_INSTALL}
    RENAME arangoimp-relative.conf)
 endif ()

 install(
  FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangoimp.conf
-  DESTINATION ${ETCDIR_NATIVE})
+  DESTINATION ${ETCDIR_INSTALL})

 install(
  DIRECTORY ${PROJECT_SOURCE_DIR}/js/common ${PROJECT_SOURCE_DIR}/js/client
@ -183,13 +183,13 @@ install(
 if (USE_RAW_CONFIG)
  install(
    FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangorestore.conf.in
-    DESTINATION ${ETCDIR_NATIVE}
+    DESTINATION ${ETCDIR_INSTALL}
    RENAME arangorestore-relative.conf)
 endif ()

 install(
  FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangorestore.conf
-  DESTINATION ${ETCDIR_NATIVE})
+  DESTINATION ${ETCDIR_INSTALL})

 install(
  DIRECTORY ${PROJECT_SOURCE_DIR}/js/common ${PROJECT_SOURCE_DIR}/js/client
@ -230,13 +230,13 @@ install(
 if (USE_RAW_CONFIG)
  install(
    FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangosh.conf.in
-    DESTINATION ${ETCDIR_NATIVE}
+    DESTINATION ${ETCDIR_INSTALL}
    RENAME arangosh-relative.conf)
 endif ()

 install(
  FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangosh.conf
-  DESTINATION ${ETCDIR_NATIVE})
+  DESTINATION ${ETCDIR_INSTALL})

 install(
  DIRECTORY ${PROJECT_SOURCE_DIR}/js/common ${PROJECT_SOURCE_DIR}/js/client