]> granicus.if.org Git - icinga2/commitdiff
Don't overwrite config files on *NIX
authorGunnar Beutner <gunnar.beutner@netways.de>
Tue, 12 Apr 2016 09:25:44 +0000 (11:25 +0200)
committerGunnar Beutner <gunnar.beutner@netways.de>
Tue, 12 Apr 2016 09:25:44 +0000 (11:25 +0200)
fixes #11542

cmake/InstallConfig.cmake

index e4af25d5ed62368593ab9dd2f0fddafd457d23d3..7f70177f973cfdc5b5819560e881247bb9281029 100644 (file)
@@ -26,7 +26,7 @@ function(install_if_not_exists src dest)
   string(REPLACE "/" "\\\\" nsis_dest_dir "${real_dest}")
   string(REPLACE "/" "\\\\" nsis_dest "${real_dest}/${basename_dest}")
   install(CODE "
-    if(\${CMAKE_INSTALL_PREFIX} MATCHES .*/_CPack_Packages/.* OR NOT EXISTS \"\$ENV{DESTDIR}${dest}/${src_name}\")
+    if(\${CMAKE_INSTALL_PREFIX} MATCHES .*/_CPack_Packages/.* OR NOT EXISTS \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/\${skel_prefix}${dest}/${src_name}\")
       message(STATUS \"Installing: \$ENV{DESTDIR}${dest}/${src_name}\")
       if(\${CMAKE_INSTALL_PREFIX} MATCHES .*/_CPack_Packages/.*)
         set(skel_prefix \"share/skel/\")