[Openvas-commits] r12090 - trunk/openvas-scanner

[scm-commit@wald.intevation.org]

Author: mwiegand
Date: 2011-11-10 12:42:28 +0100 (Thu, 10 Nov 2011)
New Revision: 12090

Modified:
   trunk/openvas-scanner/CMakeLists.txt
   trunk/openvas-scanner/ChangeLog
Log:
* CMakeLists.txt: Adjust source locations in install command to enable
  installation from an out-of-source build.


Modified: trunk/openvas-scanner/CMakeLists.txt
===================================================================
--- trunk/openvas-scanner/CMakeLists.txt	2011-11-10 11:13:33 UTC (rev 12089)
+++ trunk/openvas-scanner/CMakeLists.txt	2011-11-10 11:42:28 UTC (rev 12090)
@@ -247,7 +247,7 @@
 
 ## Install
 
-install (FILES src/openvassd
+install (FILES ${CMAKE_BINARY_DIR}/src/openvassd
   DESTINATION ${SBINDIR}
   PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
   GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
@@ -256,18 +256,30 @@
 #install (FILES openvassd_log.conf
 #         DESTINATION ${OPENVAS_SYSCONF_DIR})
 
-install (FILES tools/openvas-adduser tools/openvas-rmuser
-               tools/openvas-mkcert tools/openvas-mkcert-client
-               tools/greenbone-nvt-sync tools/openvas-nvt-sync
+install (FILES ${CMAKE_BINARY_DIR}/tools/openvas-adduser
+               ${CMAKE_BINARY_DIR}/tools/openvas-rmuser
+               ${CMAKE_BINARY_DIR}/tools/openvas-mkcert
+               ${CMAKE_BINARY_DIR}/tools/openvas-mkcert-client
+               ${CMAKE_BINARY_DIR}/tools/openvas-nvt-sync
          DESTINATION ${SBINDIR}
          PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
                      GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 
-install (FILES doc/openvas-adduser.8 doc/openvas-mkcert.8
-               doc/openvas-nvt-sync.8 doc/openvas-rmuser.8 doc/openvassd.8
-               doc/greenbone-nvt-sync.8
+install (FILES ${CMAKE_SOURCE_DIR}/tools/greenbone-nvt-sync
+         DESTINATION ${SBINDIR}
+         PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
+                     GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+
+install (FILES ${CMAKE_BINARY_DIR}/doc/openvassd.8
          DESTINATION ${DATADIR}/man/man8 )
 
+install (FILES ${CMAKE_SOURCE_DIR}/doc/openvas-adduser.8
+               ${CMAKE_SOURCE_DIR}/doc/openvas-mkcert.8
+               ${CMAKE_SOURCE_DIR}/doc/openvas-nvt-sync.8
+               ${CMAKE_SOURCE_DIR}/doc/openvas-rmuser.8
+               ${CMAKE_SOURCE_DIR}/doc/greenbone-nvt-sync.8
+         DESTINATION ${DATADIR}/man/man8 )
+
 install (DIRECTORY DESTINATION ${OPENVAS_NVT_DIR})
 install (DIRECTORY DESTINATION ${OPENVAS_CACHE_DIR})
 install (DIRECTORY

Modified: trunk/openvas-scanner/ChangeLog
===================================================================
--- trunk/openvas-scanner/ChangeLog	2011-11-10 11:13:33 UTC (rev 12089)
+++ trunk/openvas-scanner/ChangeLog	2011-11-10 11:42:28 UTC (rev 12090)
@@ -1,3 +1,8 @@
+2011-11-10  Michael Wiegand <michael.wiegand at greenbone.net>
+
+	* CMakeLists.txt: Adjust source locations in install command to enable
+	installation from an out-of-source build.
+
 2011-10-10  Michael Wiegand <michael.wiegand at greenbone.net>
 
 	Post release version bump.