1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
|
From: Hleb Valoshka <375gnu@gmail.com>
Date: Sat, 6 Jan 2018 02:01:59 +0300
Subject: Install aux scripts to $libexecdir
---
src/Makefile.am | 2 +-
src/ck-manager.c | 10 +++++-----
src/ck-seat.c | 2 +-
src/ck-session.c | 2 +-
tools/Makefile.am | 4 ++--
tools/linux/Makefile.am | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -418,7 +418,7 @@
install-data-local:
-mkdir -p $(DESTDIR)$(sysconfdir)/ConsoleKit/run-session.d
- -mkdir -p $(DESTDIR)$(libdir)/ConsoleKit/run-session.d
+ -mkdir -p $(DESTDIR)$(libexecdir)/run-session.d
-mkdir -p $(DESTDIR)$(sysconfdir)/ConsoleKit/run-seat.d
-mkdir -p $(DESTDIR)$(libdir)/ConsoleKit/run-seat.d
-mkdir -p $(DESTDIR)$(RUNDIR)/ConsoleKit
--- a/src/ck-manager.c
+++ b/src/ck-manager.c
@@ -1559,7 +1559,7 @@
data->manager = manager;
data->context = context;
- data->command = LIBDIR "/ConsoleKit/scripts/ck-system-restart";
+ data->command = LIBEXECDIR "/scripts/ck-system-restart";
data->event_type = CK_LOG_EVENT_SYSTEM_RESTART;
data->description = "Restart";
data->signal = PREPARE_FOR_SHUTDOWN;
@@ -1666,7 +1666,7 @@
data->manager = manager;
data->context = context;
- data->command = LIBDIR "/ConsoleKit/scripts/ck-system-stop";
+ data->command = LIBEXECDIR "/scripts/ck-system-stop";
data->event_type = CK_LOG_EVENT_SYSTEM_STOP;
data->description = "Stop";
data->signal = PREPARE_FOR_SHUTDOWN;
@@ -1921,7 +1921,7 @@
data->manager = manager;
data->context = context;
- data->command = LIBDIR "/ConsoleKit/scripts/ck-system-suspend";
+ data->command = LIBEXECDIR "/scripts/ck-system-suspend";
data->event_type = CK_LOG_EVENT_SYSTEM_SUSPEND;
data->description = "Suspend";
data->signal = PREPARE_FOR_SLEEP;
@@ -2053,7 +2053,7 @@
data->manager = manager;
data->context = context;
- data->command = LIBDIR "/ConsoleKit/scripts/ck-system-hibernate";
+ data->command = LIBEXECDIR "/scripts/ck-system-hibernate";
data->event_type = CK_LOG_EVENT_SYSTEM_HIBERNATE;
data->description = "Hibernate";
data->signal = PREPARE_FOR_SLEEP;
@@ -2185,7 +2185,7 @@
data->manager = manager;
data->context = context;
- data->command = LIBDIR "/ConsoleKit/scripts/ck-system-hybridsleep";
+ data->command = LIBEXECDIR "/scripts/ck-system-hybridsleep";
data->event_type = CK_LOG_EVENT_SYSTEM_HIBERNATE;
data->description = "Hybrid Sleep";
data->signal = PREPARE_FOR_SLEEP;
--- a/src/ck-seat.c
+++ b/src/ck-seat.c
@@ -1521,7 +1521,7 @@
g_assert((guint)n <= G_N_ELEMENTS(extra_env));
ck_run_programs (SYSCONFDIR "/ConsoleKit/run-seat.d", action, extra_env);
- ck_run_programs (LIBDIR "/ConsoleKit/run-seat.d", action, extra_env);
+ ck_run_programs (LIBEXECDIR "/run-seat.d", action, extra_env);
for (n = 0; extra_env[n] != NULL; n++) {
g_free (extra_env[n]);
--- a/src/ck-session.c
+++ b/src/ck-session.c
@@ -2357,7 +2357,7 @@
g_assert(n <= G_N_ELEMENTS(extra_env));
ck_run_programs (SYSCONFDIR "/ConsoleKit/run-session.d", action, extra_env);
- ck_run_programs (LIBDIR "/ConsoleKit/run-session.d", action, extra_env);
+ ck_run_programs (LIBEXECDIR "/run-session.d", action, extra_env);
for (n = 0; extra_env[n] != NULL; n++) {
g_free (extra_env[n]);
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -207,9 +207,9 @@
$(NULL)
install-exec-hook:
- mkdir -p $(DESTDIR)$(libdir)/ConsoleKit/run-seat.d
+ mkdir -p $(DESTDIR)$(libexecdir)/run-seat.d
mkdir -p $(DESTDIR)$(UDEVDIR)
- ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(libdir)/ConsoleKit/run-seat.d/udev-acl.ck
+ ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(libexecdir)/run-seat.d/udev-acl.ck
ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(UDEVDIR)/udev-acl
endif
--- a/tools/linux/Makefile.am
+++ b/tools/linux/Makefile.am
@@ -6,7 +6,7 @@
SUBDIRS = \
$(NULL)
-scriptdir = $(libdir)/ConsoleKit/scripts
+scriptdir = $(libexecdir)/scripts
script_SCRIPTS = \
ck-system-stop \
ck-system-restart \
|
