Merge lp:~smspillaz/compiz-core/compiz-core.install-link-fixes into lp:compiz-core/0.9.5

[Sam Spilsbury]

Actually install the compiz binary and link plugins to compiz_core

[Alan Griffiths (alan-griffiths)]

OK

review: Approve

=== modified file 'cmake/CompizPlugin.cmake'
--- cmake/CompizPlugin.cmake	2012-01-12 06:48:58 +0000
+++ cmake/CompizPlugin.cmake	2012-01-21 17:18:25 +0000
@@ -404,6 +404,7 @@
 		      ${${_PLUGIN}_PKG_LIBRARIES}
 		      ${${_PLUGIN}_LIBRARIES}
 		      ${${_PLUGIN}_MOD_LIBRARIES}
+		      compiz_core
 	)
 
 	install (
 
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2012-01-20 15:42:52 +0000
+++ src/CMakeLists.txt	2012-01-21 17:18:25 +0000
@@ -77,6 +77,7 @@
 link_directories (
     ${COMPIZ_LINK_DIRS}
     ${CORE_MOD_LIBRARY_DIRS}
+    ${libdir}
 )
 
 add_library (compiz_core SHARED
@@ -144,10 +145,14 @@
 
 install (
     TARGETS compiz_core
+  	LIBRARY DESTINATION ${COMPIZ_DESTDIR}${libdir}
+)
+
+install (
+    TARGETS compiz
     RUNTIME DESTINATION ${COMPIZ_DESTDIR}${exec_prefix}
-  	LIBRARY DESTINATION ${COMPIZ_DESTDIR}${libdir}
-  	ARCHIVE DESTINATION ${COMPIZ_DESTDIR}${libdir}
 )
+
 add_subdirectory(tests)
 
 enable_coverage_report( TARGETS compiz )