Merge lp:~compiz-team/compiz/compiz.fix_1005176 into lp:compiz/0.9.8

[Sam Spilsbury]

libcompizconfig's install () commands were still using the old includedir and libdir variables rather than their libcompizconfig_* variants.

[Daniel van Vugt (vanvugt)]

review: Approve

=== modified file 'compizconfig/libcompizconfig/include/CMakeLists.txt'
--- compizconfig/libcompizconfig/include/CMakeLists.txt	2012-05-24 06:30:07 +0000
+++ compizconfig/libcompizconfig/include/CMakeLists.txt	2012-05-27 14:31:32 +0000
@@ -5,5 +5,5 @@
 
 install (
 	FILES ${_headers}
-	DESTINATION ${includedir}
+	DESTINATION ${libcompizconfig_includedir}
 	)

=== modified file 'compizconfig/libcompizconfig/src/CMakeLists.txt'
--- compizconfig/libcompizconfig/src/CMakeLists.txt	2012-05-24 00:55:17 +0000
+++ compizconfig/libcompizconfig/src/CMakeLists.txt	2012-05-27 14:31:32 +0000
@@ -76,5 +76,5 @@
 
 install (
     TARGETS compizconfig
-    DESTINATION ${libdir}
+    DESTINATION ${libcompizconfig_libdir}
 )