diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-06 10:18:51 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-06 10:18:51 +0200 |
| commit | 8688ef22c21b810e7d5d4732a3f73035eb171879 (patch) | |
| tree | cbcea402e9c8039e5752c71e1193985406777f2d /support-files | |
| parent | d7a2401750bb29dfdb45929a536539b9f17b347f (diff) | |
| parent | 4e99e67c4e8a04bd03cb0e7efc2ce0129af60c34 (diff) | |
| download | mariadb-git-8688ef22c21b810e7d5d4732a3f73035eb171879.tar.gz | |
Merge 10.1 to 10.2
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index 9fb045c0657..6ab84b59b29 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -77,11 +77,12 @@ IF(UNIX) IF(CHECKMODULE AND SEMODULE_PACKAGE) FOREACH(pol mariadb) SET(src ${CMAKE_CURRENT_SOURCE_DIR}/policy/selinux/${pol}.te) - SET(tmp ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${pol}-pp.dir/${pol}.mod) + SET(tmp ${CMAKE_CURRENT_BINARY_DIR}/${pol}.mod) SET(out ${CMAKE_CURRENT_BINARY_DIR}/${pol}.pp) ADD_CUSTOM_COMMAND(OUTPUT ${out} COMMAND ${CHECKMODULE} -M -m ${src} -o ${tmp} COMMAND ${SEMODULE_PACKAGE} -m ${tmp} -o ${out} + COMMAND ${CMAKE_COMMAND} -E remove ${tmp} DEPENDS ${src}) ADD_CUSTOM_TARGET(${pol}-pp ALL DEPENDS ${out}) INSTALL(FILES ${out} DESTINATION ${inst_location}/policy/selinux COMPONENT SupportFiles) |