summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorasn <asn@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2010-12-17 21:14:36 +0000
committerasn <asn@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2010-12-17 21:14:36 +0000
commite739c60c799d8a36e29a26f1e372608a661ff9a2 (patch)
treebb20fe4ce8a7fa6e475e8687efe68c1e04fdf650
parent26f4346b6bcbb6efdea35452db508a27664abe4c (diff)
downloadpki-e739c60c799d8a36e29a26f1e372608a661ff9a2.tar.gz
pki-e739c60c799d8a36e29a26f1e372608a661ff9a2.tar.xz
pki-e739c60c799d8a36e29a26f1e372608a661ff9a2.zip
cmake: Fixed the setup directory creation on install.
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1645 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
-rw-r--r--pki/base/setup/CMakeLists.txt13
-rw-r--r--pki/cmake/Modules/DefineInstallationPaths.cmake5
2 files changed, 7 insertions, 11 deletions
diff --git a/pki/base/setup/CMakeLists.txt b/pki/base/setup/CMakeLists.txt
index 457ceaf5c..e37306365 100644
--- a/pki/base/setup/CMakeLists.txt
+++ b/pki/base/setup/CMakeLists.txt
@@ -24,14 +24,5 @@ install(
)
# install empty directories
-install(
- DIRECTORY
- DESTINATION
- ${VAR_INSTALL_DIR}/lock/pki
-)
-
-install(
- DIRECTORY
- DESTINATION
- ${VAR_INSTALL_DIR}/run/pki
-)
+install(CODE "file(MAKE_DIRECTORY ${VAR_INSTALL_DIR}/lock/pki)")
+install(CODE "file(MAKE_DIRECTORY ${VAR_INSTALL_DIR}/run/pki)")
diff --git a/pki/cmake/Modules/DefineInstallationPaths.cmake b/pki/cmake/Modules/DefineInstallationPaths.cmake
index efaa79d62..bc8d9b21a 100644
--- a/pki/cmake/Modules/DefineInstallationPaths.cmake
+++ b/pki/cmake/Modules/DefineInstallationPaths.cmake
@@ -100,6 +100,11 @@ if (UNIX)
"${SHARE_INSTALL_PREFIX}/info"
CACHE PATH "The ${APPLICATION_NAME} info install dir (default prefix/info)"
)
+
+ set(VAR_INSTALL_DIR
+ ${EXEC_INSTALL_PREFIX}/var
+ CACHE PATH "The /var install dir (default prefix/var)"
+ )
endif (UNIX)
if (WIN32)