diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-06 13:14:31 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-06 13:14:31 +0200 |
| commit | 908ca4668d5cb415f4737c8617ffb84f2c15855d (patch) | |
| tree | 97b0b5322c3833d5d66e6a8b0c6de195aca18320 /support-files | |
| parent | 5d3bd2b75b5bf32e69a9b32333cbf8dffe7a2541 (diff) | |
| parent | 90451a59811b415a443aab97230e694856392cb5 (diff) | |
| download | mariadb-git-908ca4668d5cb415f4737c8617ffb84f2c15855d.tar.gz | |
Merge 10.2 into 10.3
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 749964284c4..9be3ed65095 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -68,11 +68,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) |