diff options
Diffstat (limited to 'meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch')
-rw-r--r-- | meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch b/meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch index 15a7bfc732..cb09f17a56 100644 --- a/meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch +++ b/meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From a8ef81c115a45f05dad145c98e10f3c4940e4e29 Mon Sep 17 00:00:00 2001 | 1 | From ffb7942cc73c3d2c6aa7c689cdaf9bc0bcbc144b Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Thu, 26 Jan 2017 16:25:47 +0200 | 3 | Date: Thu, 26 Jan 2017 16:25:47 +0200 |
4 | Subject: [PATCH 3/5] Do not hardcode /etc and systemd unit directories | 4 | Subject: [PATCH] Do not hardcode /etc and systemd unit directories |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [oe-core specific] | 6 | Upstream-Status: Inappropriate [oe-core specific] |
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
@@ -11,20 +11,17 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
11 | 1 file changed, 2 insertions(+), 2 deletions(-) | 11 | 1 file changed, 2 insertions(+), 2 deletions(-) |
12 | 12 | ||
13 | diff --git a/CMakeLists.txt b/CMakeLists.txt | 13 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
14 | index 650b624a..10199618 100644 | 14 | index 73552967..38cf4fbf 100644 |
15 | --- a/CMakeLists.txt | 15 | --- a/CMakeLists.txt |
16 | +++ b/CMakeLists.txt | 16 | +++ b/CMakeLists.txt |
17 | @@ -7,8 +7,8 @@ if (NOT PYTHON_DESIRED) | 17 | @@ -3,8 +3,8 @@ CMAKE_MINIMUM_REQUIRED (VERSION 2.4) |
18 | set (PYTHON_DESIRED "2") | 18 | |
19 | endif() | 19 | INCLUDE (${CMAKE_SOURCE_DIR}/VERSION.cmake) |
20 | 20 | ||
21 | -SET( SYSCONFDIR /etc) | 21 | -SET( SYSCONFDIR /etc) |
22 | -SET( SYSTEMD_DIR /usr/lib/systemd/system) | 22 | -SET( SYSTEMD_DIR /usr/lib/systemd/system) |
23 | +SET( SYSCONFDIR ${CMAKE_INSTALL_SYSCONFDIR}) | 23 | +SET( SYSCONFDIR ${CMAKE_INSTALL_SYSCONFDIR}) |
24 | +SET( SYSTEMD_DIR $ENV{systemd_system_unitdir}) | 24 | +SET( SYSTEMD_DIR $ENV{systemd_system_unitdir}) |
25 | 25 | ||
26 | if (${PYTHON_DESIRED} STREQUAL "2") | 26 | IF (NOT PYTHON_DESIRED) |
27 | FIND_PACKAGE (PythonInterp REQUIRED) | 27 | FIND_PACKAGE (PythonInterp REQUIRED) |
28 | -- | ||
29 | 2.14.2 | ||
30 | |||