Attachment 116061 Details for Bug 89280 – [3/3] Use /var & /etc, relative DBUS_INSTALL_DIR in cmake.

[3/3] Use /var & /etc, relative DBUS_INSTALL_DIR in cmake.

0003-Use-var-etc-relative-DBUS_INSTALL_DIR-in-cmake.patch (text/plain), 1.36 KB, created by xnox on 2015-05-26 20:24:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: xnox

Created: 2015-05-26 20:24:53 UTC

Size: 1.36 KB

patch

obsolete

>From a44699c262d70691bdce2c34c6af9972c7b45612 Mon Sep 17 00:00:00 2001
>From: Dimitri John Ledkov <dimitri.j.ledkov@intel.com>
>Date: Tue, 26 May 2015 21:22:32 +0100
>Subject: [PATCH 3/3] Use /var & /etc, relative DBUS_INSTALL_DIR in cmake.
>Organization: Intel Corporation (UK) Ltd. - Co. Reg. #1134945 - Pipers Way, Swindon SN3 1RJ
>
>---
> cmake/CMakeLists.txt | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
>index bcf18b8..e072dfa 100644
>--- a/cmake/CMakeLists.txt
>+++ b/cmake/CMakeLists.txt
>@@ -86,12 +86,13 @@ set(EXPANDED_LIBDIR          ${DBUS_INSTALL_DIR}/lib)
> set(EXPANDED_INCLUDEDIR      ${DBUS_INSTALL_DIR}/include)
> set(EXPANDED_BINDIR          ${DBUS_INSTALL_DIR}/bin)
> set(EXPANDED_SYSCONFDIR      ${DBUS_INSTALL_DIR}/etc)
>+set(EXPANDED_LOCALSTATEDIR   ${DBUS_INSTALL_DIR}/var)
> set(EXPANDED_DATADIR         ${DBUS_INSTALL_DIR}/${DBUS_DATADIR})
> set(DBUS_MACHINE_UUID_FILE   ${DBUS_INSTALL_DIR}/lib/dbus/machine-id)
> set(DBUS_BINDIR              ${EXPANDED_BINDIR})
> set(DBUS_DAEMONDIR           ${EXPANDED_BINDIR})
>-set(DBUS_LOCALSTATEDIR       /var)
>-set(DBUS_SYSCONFDIR          /etc)
>+set(DBUS_LOCALSTATEDIR       ${EXPANDED_LOCALSTATEDIR})
>+set(DBUS_SYSCONFDIR          ${EXPANDED_SYSCONFDIR})
> set(DBUS_LIBEXECDIR          ${EXPANDED_LIBDIR})
> set(DBUS_DATADIR             ${EXPANDED_DATADIR})
> 
>-- 
>2.1.4
>

Actions: View

Attachments on bug 89280: 113750 | 113751 | 113819 | 113820 | 113821 | 113917 | 113918 | 116061 | 116073 | 116074

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.