Merge lp:~muktupavels/compiz/sysconfdir into lp: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:~muktupavels/compiz/sysconfdir
Merge into: lp: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:~muktupavels/compiz/sysconfdir
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Compiz Maintainers Pending
Review via email: mp+348625@code.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
=== modified file 'cmake/CompizCommon.cmake'
--- cmake/CompizCommon.cmake 2015-07-30 20:16:16 +0000
+++ cmake/CompizCommon.cmake 2018-06-27 16:45:55 +0000
@@ -39,7 +39,7 @@
39set (COMPIZ_METADATADIR ${CMAKE_INSTALL_PREFIX}/share/compiz)39set (COMPIZ_METADATADIR ${CMAKE_INSTALL_PREFIX}/share/compiz)
40set (COMPIZ_IMAGEDIR ${CMAKE_INSTALL_PREFIX}/share/compiz/images)40set (COMPIZ_IMAGEDIR ${CMAKE_INSTALL_PREFIX}/share/compiz/images)
41set (COMPIZ_PLUGINDIR ${libdir}/compiz)41set (COMPIZ_PLUGINDIR ${libdir}/compiz)
42set (COMPIZ_SYSCONFDIR ${sysconfdir})42set (COMPIZ_SYSCONFDIR ${CMAKE_INSTALL_FULL_SYSCONFDIR})
4343
44set (44set (
45 VERSION ${VERSION} CACHE STRING45 VERSION ${VERSION} CACHE STRING
4646
=== modified file 'compizconfig/libcompizconfig/CMakeLists.txt'
--- compizconfig/libcompizconfig/CMakeLists.txt 2013-05-13 13:43:36 +0000
+++ compizconfig/libcompizconfig/CMakeLists.txt 2018-06-27 16:45:55 +0000
@@ -30,8 +30,6 @@
30 "include"30 "include"
31 )31 )
3232
33set (COMPIZ_SYSCONFDIR "/etc" CACHE PATH "/etc")
34
35option (USE_PROTOBUF33option (USE_PROTOBUF
36 "Use Google Protocol Buffers library for faster XML loading"34 "Use Google Protocol Buffers library for faster XML loading"
37 ON35 ON

Subscribers

People subscribed via source and target branches