Merge lp://qastaging/~muktupavels/compiz/sysconfdir into lp://qastaging/compiz/0.9.13

Proposed by Alberts Muktupāvels
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 4144
Merged at revision: 4147
Proposed branch: lp://qastaging/~muktupavels/compiz/sysconfdir
Merge into: lp://qastaging/compiz/0.9.13
Diff against target: 25 lines (+1/-3)
2 files modified
cmake/CompizCommon.cmake (+1/-1)
compizconfig/libcompizconfig/CMakeLists.txt (+0/-2)
To merge this branch: bzr merge lp://qastaging/~muktupavels/compiz/sysconfdir
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Compiz Maintainers Pending
Review via email: mp+348625@code.qastaging.launchpad.net

Commit message

Properly set COMPIZ_SYSCONFDIR.

Description of the change

Use CMAKE_INSTALL_FULL_SYSCONFDIR to set COMPIZ_SYSCONFDIR. This allows to use -DCMAKE_INSTALL_SYSCONFDIR to set custom sysconfdir and without this it will be properly set to ${CMAKE_INSTALL_PREFIX}/etc.

Right now it always tries to install compizconfig/config in /etc ignoring prefix set with -DCMAKE_INSTALL_PREFIX.

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches