[geary] Don't try to install the contractor file if disabled. Bug 790382.



commit 412549a3f7aa6b5ea792f8171d2b09766282e603
Author: Michael James Gratton <mike vee net>
Date:   Sun Nov 19 21:55:03 2017 +1100

    Don't try to install the contractor file if disabled. Bug 790382.
    
    Patch courtesy Jiri Cerny.

 desktop/CMakeLists.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/desktop/CMakeLists.txt b/desktop/CMakeLists.txt
index 5ade054..ce4d8a5 100644
--- a/desktop/CMakeLists.txt
+++ b/desktop/CMakeLists.txt
@@ -29,7 +29,6 @@ endif (DESKTOP_VALIDATE)
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.gnome.Geary.appdata.xml DESTINATION 
${CMAKE_INSTALL_PREFIX}/share/metainfo)
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.gnome.Geary.desktop DESTINATION 
${CMAKE_INSTALL_PREFIX}/share/applications)
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/geary-autostart.desktop DESTINATION 
${CMAKE_INSTALL_PREFIX}/share/applications)
-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/geary-attach.contract DESTINATION 
${CMAKE_INSTALL_PREFIX}/share/contractor)
 
 # Optional: run update-desktop-database at install time.
 # (This has to happen after the org.gnome.Geary.desktop file is installed.)
@@ -79,4 +78,5 @@ else (DISABLE_CONTRACT)
 #        endif (DESKTOP_VALIDATE)
     endif (GETTEXT_FOUND)
     install (PROGRAMS geary-attach DESTINATION bin)
+    install (FILES ${CMAKE_CURRENT_BINARY_DIR}/geary-attach.contract DESTINATION 
${CMAKE_INSTALL_PREFIX}/share/contractor)
 endif (DISABLE_CONTRACT)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]