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

Proposed by Sam Spilsbury
Status: Merged
Approved by: Sam Spilsbury
Approved revision: 3654
Merged at revision: 3657
Proposed branch: lp:~compiz-team/compiz/compiz.fix_1163611
Merge into: lp:compiz/0.9.10
Diff against target: 20 lines (+2/-2)
1 file modified
compizconfig/libcompizconfig/cmake/LibCompizConfigCommon.cmake (+2/-2)
To merge this branch: bzr merge lp:~compiz-team/compiz/compiz.fix_1163611
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
MC Return Approve
Compiz Maintainers Pending
Review via email: mp+158741@code.launchpad.net

Commit message

Install compizconfig backends to the correct libdir

(LP: #1163611)

Description of the change

Install compizconfig backends to the correct libdir

(LP: #1163611)

To post a comment you must log in.
Revision history for this message
MC Return (mc-return) wrote :

LGTM.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'compizconfig/libcompizconfig/cmake/LibCompizConfigCommon.cmake'
2--- compizconfig/libcompizconfig/cmake/LibCompizConfigCommon.cmake 2012-10-16 13:53:20 +0000
3+++ compizconfig/libcompizconfig/cmake/LibCompizConfigCommon.cmake 2013-04-13 04:57:27 +0000
4@@ -106,7 +106,7 @@
5
6 set_target_properties (
7 ${bname} PROPERTIES
8- INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib"
9+ INSTALL_RPATH "${libcompizconfig_libdir}"
10 COMPILE_FLAGS "${${_BACKEND}_CFLAGSADD}"
11 LINK_FLAGS "${${_BACKEND}_LDFLAGSADD}"
12 )
13@@ -122,6 +122,6 @@
14
15 install (
16 TARGETS ${bname}
17- DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/compizconfig/backends
18+ DESTINATION ${libcompizconfig_libdir}/compizconfig/backends
19 )
20 endfunction (compizconfig_backend bname)

Subscribers

People subscribed via source and target branches

to all changes: