diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2013-04-29 14:48:23 -0400 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2013-04-29 16:57:59 -0400 |
| commit | 7b95b9d69a19cd714cae2fae0c45ffd75f016f5e (patch) | |
| tree | a844791c7c99e2908e856b5e2de87a743084aeec /base/common/CMakeLists.txt | |
| parent | 23cbc44604ec0f5408da023fb858e9799fddb775 (diff) | |
| download | pki-7b95b9d69a19cd714cae2fae0c45ffd75f016f5e.tar.gz pki-7b95b9d69a19cd714cae2fae0c45ffd75f016f5e.tar.xz pki-7b95b9d69a19cd714cae2fae0c45ffd75f016f5e.zip | |
Added upgrade scriptlet to add JNI_JAR_DIR.
A new upgrade scriptlet has been added to add JNI_JAR_DIR into
pki.conf. The code to manipulate property files has been refactored
from PKIUpgradeTracker into a separate PropertyFile class to allow
reuse.
The pki-base package has been modified to deliver a default pki.conf
in /usr/share/pki/etc and copy it into /etc/pki if it doesn't exist.
Diffstat (limited to 'base/common/CMakeLists.txt')
| -rw-r--r-- | base/common/CMakeLists.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/base/common/CMakeLists.txt b/base/common/CMakeLists.txt index fb3ed75d5..e23e5c5f4 100644 --- a/base/common/CMakeLists.txt +++ b/base/common/CMakeLists.txt @@ -2,15 +2,15 @@ project(common NONE) # install common configuration files configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/etc/pki.conf - ${CMAKE_CURRENT_BINARY_DIR}/etc/pki.conf + ${CMAKE_CURRENT_SOURCE_DIR}/share/etc/pki.conf + ${CMAKE_CURRENT_BINARY_DIR}/share/etc/pki.conf ) install( FILES - ${CMAKE_CURRENT_BINARY_DIR}/etc/pki.conf + ${CMAKE_CURRENT_BINARY_DIR}/share/etc/pki.conf DESTINATION - ${SYSCONF_INSTALL_DIR}/pki/ + ${DATA_INSTALL_DIR}/etc/ ) # install Python libraries @@ -59,7 +59,8 @@ install( WORLD_EXECUTE WORLD_READ ) -# install directories +# install server files +# TODO: move into base/server install( DIRECTORY shared/ |