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

Proposed by Sam Spilsbury on 2012-05-27
Status: Merged
Merged at revision: 3232
Proposed branch: lp:~compiz-team/compiz/compiz.fix_1005176
Merge into: lp:compiz/0.9.8
Diff against target: 21 lines (+2/-2)
2 files modified
compizconfig/libcompizconfig/include/CMakeLists.txt (+1/-1)
compizconfig/libcompizconfig/src/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~compiz-team/compiz/compiz.fix_1005176
Reviewer Review Type Date Requested Status
Daniel van Vugt 2012-05-27 Approve on 2012-05-28
Review via email: mp+107557@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Daniel van Vugt (vanvugt) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'compizconfig/libcompizconfig/include/CMakeLists.txt'
2--- compizconfig/libcompizconfig/include/CMakeLists.txt 2012-05-24 06:30:07 +0000
3+++ compizconfig/libcompizconfig/include/CMakeLists.txt 2012-05-27 14:31:32 +0000
4@@ -5,5 +5,5 @@
5
6 install (
7 FILES ${_headers}
8- DESTINATION ${includedir}
9+ DESTINATION ${libcompizconfig_includedir}
10 )
11
12=== modified file 'compizconfig/libcompizconfig/src/CMakeLists.txt'
13--- compizconfig/libcompizconfig/src/CMakeLists.txt 2012-05-24 00:55:17 +0000
14+++ compizconfig/libcompizconfig/src/CMakeLists.txt 2012-05-27 14:31:32 +0000
15@@ -76,5 +76,5 @@
16
17 install (
18 TARGETS compizconfig
19- DESTINATION ${libdir}
20+ DESTINATION ${libcompizconfig_libdir}
21 )

Subscribers

People subscribed via source and target branches