Merge lp:~compiz-team/compiz/compiz.fix_1173799 into lp:compiz/0.9.10

[Sam Spilsbury]

Set libcompizconfig_libdir before the modules get a chance to see it.
(LP: #1173799)

Set libcompizconfig_libdir before the modules get a chance to see it.
(LP: #1173799)

[MC Return (mc-return)]

LGTM. (no space to test ATM)

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3680
http://jenkins.qa.ubuntu.com/job/compiz-ci/162/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/200
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-raring-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-raring-armhf-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-raring-i386-ci/17

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-ci/162/rebuild

review: Approve (continuous-integration)

=== modified file 'compizconfig/CMakeLists.txt'
--- compizconfig/CMakeLists.txt	2012-12-13 14:14:15 +0000
+++ compizconfig/CMakeLists.txt	2013-04-28 00:17:25 +0000
@@ -4,6 +4,18 @@
 set (COMPIZCONFIG_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/libcompizconfig/include)
 set (COMPIZCONFIG_LIBRARY_DIRS ${CMAKE_CURRENT_BINARY_DIR}/libcompizconfig)
 
+if (COMPIZ_PACKAGING_ENABLED)
+    set (libcompizconfig_libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}         CACHE PATH "libdir")
+    set (libcompizconfig_includedir ${CMAKE_INSTALL_PREFIX}/include/compizconfig CACHE PATH "includedir")
+    set (libcompizconfig_prefix ${CMAKE_INSTALL_PREFIX}                          CACHE PATH "prefix")
+    set (libcompizconfig_exec_prefix ${CMAKE_INSTALL_PREFIX}/bin                 CACHE PATH "bindir")
+else (COMPIZ_PACKAGING_ENABLED)
+    set (libcompizconfig_libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+    set (libcompizconfig_includedir ${CMAKE_INSTALL_PREFIX}/include/compizconfig)
+    set (libcompizconfig_prefix ${CMAKE_INSTALL_PREFIX})
+    set (libcompizconfig_exec_prefix ${CMAKE_INSTALL_PREFIX}/bin)
+endif (COMPIZ_PACKAGING_ENABLED)
+
 option (USE_GCONF "Enable legacy GNOME 2.x option integration with GConf" ON)
 
 add_subdirectory (libcompizconfig)

=== modified file 'compizconfig/libcompizconfig/CMakeLists.txt'
--- compizconfig/libcompizconfig/CMakeLists.txt	2012-09-04 01:00:10 +0000
+++ compizconfig/libcompizconfig/CMakeLists.txt	2013-04-28 00:17:25 +0000
@@ -30,18 +30,6 @@
     "include"
     )
 
-if (COMPIZ_PACKAGING_ENABLED)
-    set (libcompizconfig_libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}         CACHE PATH "libdir")
-    set (libcompizconfig_includedir ${CMAKE_INSTALL_PREFIX}/include/compizconfig CACHE PATH "includedir")
-    set (libcompizconfig_prefix ${CMAKE_INSTALL_PREFIX}                          CACHE PATH "prefix")
-    set (libcompizconfig_exec_prefix ${CMAKE_INSTALL_PREFIX}/bin                 CACHE PATH "bindir")
-else (COMPIZ_PACKAGING_ENABLED)
-    set (libcompizconfig_libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
-    set (libcompizconfig_includedir ${CMAKE_INSTALL_PREFIX}/include/compizconfig)
-    set (libcompizconfig_prefix ${CMAKE_INSTALL_PREFIX})
-    set (libcompizconfig_exec_prefix ${CMAKE_INSTALL_PREFIX}/bin)
-endif (COMPIZ_PACKAGING_ENABLED)
-
 set (COMPIZ_SYSCONFDIR "/etc" CACHE PATH "/etc")
 
 option (USE_PROTOBUF