diff options
| author | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-12-07 00:33:26 +0000 |
|---|---|---|
| committer | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-12-07 00:33:26 +0000 |
| commit | dce657795aff27d3a615a145acffa739cf9e676a (patch) | |
| tree | ca6a35cb0e5fa929e87cb03ef9028d68f2cdae2c /pki/base/kra | |
| parent | 3b5729e16fc37dfe12fe9964e467983335d9137c (diff) | |
| download | pki-dce657795aff27d3a615a145acffa739cf9e676a.tar.gz pki-dce657795aff27d3a615a145acffa739cf9e676a.tar.xz pki-dce657795aff27d3a615a145acffa739cf9e676a.zip | |
Bugzilla Bug #643206 - New CMake based build system for Dogtag
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1607 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/kra')
| -rw-r--r-- | pki/base/kra/CMakeLists.txt | 28 | ||||
| -rw-r--r-- | pki/base/kra/setup/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | pki/base/kra/src/CMakeLists.txt | 2 |
3 files changed, 17 insertions, 14 deletions
diff --git a/pki/base/kra/CMakeLists.txt b/pki/base/kra/CMakeLists.txt index 6d9524ddf..5155a84ef 100644 --- a/pki/base/kra/CMakeLists.txt +++ b/pki/base/kra/CMakeLists.txt @@ -8,18 +8,7 @@ install( FILES shared/etc/init.d/pki-krad DESTINATION - ${SYSCONF_INSTALL_DIR}/init.d - PERMISSIONS - OWNER_EXECUTE OWNER_WRITE OWNER_READ - GROUP_EXECUTE GROUP_READ - WORLD_EXECUTE WORLD_READ -) - -install( - FILES - shared/conf/dtomcat5 - DESTINATION - ${SHARE_INSTALL_PREFIX}/${APPLICATION_NAME}/${PROJECT_NAME} + ${SYSCONF_INSTALL_DIR}/rc.d/init.d PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ @@ -33,7 +22,20 @@ install( DESTINATION ${SHARE_INSTALL_PREFIX}/${APPLICATION_NAME}/${PROJECT_NAME} PATTERN - "shared/conf/dtomcat5" EXCLUDE + "CMakeLists.txt" EXCLUDE PATTERN "etc/*" EXCLUDE ) + +# install empty directories +install( + DIRECTORY + DESTINATION + ${VAR_INSTALL_DIR}/lock/pki/kra +) + +install( + DIRECTORY + DESTINATION + ${VAR_INSTALL_DIR}/run/pki/kra +) diff --git a/pki/base/kra/setup/CMakeLists.txt b/pki/base/kra/setup/CMakeLists.txt index 9c8713a7f..25ea20ffe 100644 --- a/pki/base/kra/setup/CMakeLists.txt +++ b/pki/base/kra/setup/CMakeLists.txt @@ -5,6 +5,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.desktop.in ${CMAKE_CURRENT_BIN install( FILES ${CMAKE_CURRENT_BINARY_DIR}/config.desktop + registry_instance DESTINATION ${SHARE_INSTALL_PREFIX}/${APPLICATION_NAME}/${PROJECT_NAME}/setup ) diff --git a/pki/base/kra/src/CMakeLists.txt b/pki/base/kra/src/CMakeLists.txt index caea1495b..d483a0a3a 100644 --- a/pki/base/kra/src/CMakeLists.txt +++ b/pki/base/kra/src/CMakeLists.txt @@ -38,5 +38,5 @@ set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION}) add_jar(kra ${kra_java_SRCS}) add_dependencies(kra nsutil cmsutil osutil symkey cms cmscore certsrv) -install_jar(kra ${JAVA_JAR_INSTALL_DIR}/pki) +install_jar(kra ${JAVA_JAR_INSTALL_DIR}) set(KRA_JAR ${kra_JAR_FILE} CACHE INTERNAL "kra jar file") |