Contents of /trunk/consolekit/patches/consolekit-0.4.1-multilib.patch
Parent Directory | Revision Log
Revision 930 -
(show annotations)
(download)
Sun Nov 8 03:47:35 2009 UTC (14 years, 10 months ago) by niro
File size: 4378 byte(s)
Sun Nov 8 03:47:35 2009 UTC (14 years, 10 months ago) by niro
File size: 4378 byte(s)
-files and fixes for consolekit-0.4.1-r1
1 | From c4ba8b276bf95faf2f643e42988709ed6cb0b2f0 Mon Sep 17 00:00:00 2001 |
2 | From: Gilles Dartiguelongue <eva@gentoo.org> |
3 | Date: Sun, 18 Oct 2009 23:30:36 +0200 |
4 | Subject: [PATCH] respect multilib |
5 | |
6 | --- |
7 | src/Makefile.am | 4 ++-- |
8 | src/ck-manager.c | 4 ++-- |
9 | src/ck-seat.c | 2 +- |
10 | src/ck-session.c | 2 +- |
11 | tools/freebsd/Makefile.am | 2 +- |
12 | tools/linux/Makefile.am | 2 +- |
13 | tools/solaris/Makefile.am | 2 +- |
14 | 7 files changed, 9 insertions(+), 9 deletions(-) |
15 | |
16 | diff --git a/src/Makefile.am b/src/Makefile.am |
17 | index 6ab05c8..d6fb810 100644 |
18 | --- a/src/Makefile.am |
19 | +++ b/src/Makefile.am |
20 | @@ -204,8 +204,8 @@ MAINTAINERCLEANFILES = \ |
21 | |
22 | install-data-local: |
23 | -mkdir -p $(DESTDIR)$(sysconfdir)/ConsoleKit/run-session.d |
24 | - -mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-session.d |
25 | + -mkdir -p $(DESTDIR)$(libdir)/ConsoleKit/run-session.d |
26 | -mkdir -p $(DESTDIR)$(sysconfdir)/ConsoleKit/run-seat.d |
27 | - -mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d |
28 | + -mkdir -p $(DESTDIR)$(libdir)/ConsoleKit/run-seat.d |
29 | -mkdir -p $(DESTDIR)$(localstatedir)/run/ConsoleKit |
30 | -mkdir -p $(DESTDIR)$(localstatedir)/log/ConsoleKit |
31 | diff --git a/src/ck-manager.c b/src/ck-manager.c |
32 | index 99693a3..e65e25b 100644 |
33 | --- a/src/ck-manager.c |
34 | +++ b/src/ck-manager.c |
35 | @@ -1083,7 +1083,7 @@ do_restart (CkManager *manager, |
36 | log_system_restart_event (manager); |
37 | |
38 | error = NULL; |
39 | - res = g_spawn_command_line_async (PREFIX "/lib/ConsoleKit/scripts/ck-system-restart", |
40 | + res = g_spawn_command_line_async (LIBDIR "/ConsoleKit/scripts/ck-system-restart", |
41 | &error); |
42 | if (! res) { |
43 | GError *new_error; |
44 | @@ -1164,7 +1164,7 @@ do_stop (CkManager *manager, |
45 | log_system_stop_event (manager); |
46 | |
47 | error = NULL; |
48 | - res = g_spawn_command_line_async (PREFIX "/lib/ConsoleKit/scripts/ck-system-stop", |
49 | + res = g_spawn_command_line_async (LIBDIR "/ConsoleKit/scripts/ck-system-stop", |
50 | &error); |
51 | if (! res) { |
52 | GError *new_error; |
53 | diff --git a/src/ck-seat.c b/src/ck-seat.c |
54 | index af7db59..d089f29 100644 |
55 | --- a/src/ck-seat.c |
56 | +++ b/src/ck-seat.c |
57 | @@ -1278,7 +1278,7 @@ ck_seat_run_programs (CkSeat *seat, |
58 | g_assert(n <= G_N_ELEMENTS(extra_env)); |
59 | |
60 | ck_run_programs (SYSCONFDIR "/ConsoleKit/run-seat.d", action, extra_env); |
61 | - ck_run_programs (PREFIX "/lib/ConsoleKit/run-seat.d", action, extra_env); |
62 | + ck_run_programs (LIBDIR "/ConsoleKit/run-seat.d", action, extra_env); |
63 | |
64 | for (n = 0; extra_env[n] != NULL; n++) { |
65 | g_free (extra_env[n]); |
66 | diff --git a/src/ck-session.c b/src/ck-session.c |
67 | index d8db9dd..c2fc320 100644 |
68 | --- a/src/ck-session.c |
69 | +++ b/src/ck-session.c |
70 | @@ -1287,7 +1287,7 @@ ck_session_run_programs (CkSession *session, |
71 | g_assert(n <= G_N_ELEMENTS(extra_env)); |
72 | |
73 | ck_run_programs (SYSCONFDIR "/ConsoleKit/run-session.d", action, extra_env); |
74 | - ck_run_programs (PREFIX "/lib/ConsoleKit/run-session.d", action, extra_env); |
75 | + ck_run_programs (LIBDIR "/ConsoleKit/run-session.d", action, extra_env); |
76 | |
77 | for (n = 0; extra_env[n] != NULL; n++) { |
78 | g_free (extra_env[n]); |
79 | diff --git a/tools/freebsd/Makefile.am b/tools/freebsd/Makefile.am |
80 | index f668722..d25930e 100644 |
81 | --- a/tools/freebsd/Makefile.am |
82 | +++ b/tools/freebsd/Makefile.am |
83 | @@ -6,7 +6,7 @@ NULL = |
84 | SUBDIRS = \ |
85 | $(NULL) |
86 | |
87 | -scriptdir = $(prefix)/lib/ConsoleKit/scripts |
88 | +scriptdir = $(libdir)/ConsoleKit/scripts |
89 | script_SCRIPTS = \ |
90 | ck-system-stop \ |
91 | ck-system-restart \ |
92 | diff --git a/tools/linux/Makefile.am b/tools/linux/Makefile.am |
93 | index 5a95942..51196c0 100644 |
94 | --- a/tools/linux/Makefile.am |
95 | +++ b/tools/linux/Makefile.am |
96 | @@ -6,7 +6,7 @@ NULL = |
97 | SUBDIRS = \ |
98 | $(NULL) |
99 | |
100 | -scriptdir = $(prefix)/lib/ConsoleKit/scripts |
101 | +scriptdir = $(libdir)/ConsoleKit/scripts |
102 | script_SCRIPTS = \ |
103 | ck-system-stop \ |
104 | ck-system-restart \ |
105 | diff --git a/tools/solaris/Makefile.am b/tools/solaris/Makefile.am |
106 | index f668722..d25930e 100644 |
107 | --- a/tools/solaris/Makefile.am |
108 | +++ b/tools/solaris/Makefile.am |
109 | @@ -6,7 +6,7 @@ NULL = |
110 | SUBDIRS = \ |
111 | $(NULL) |
112 | |
113 | -scriptdir = $(prefix)/lib/ConsoleKit/scripts |
114 | +scriptdir = $(libdir)/ConsoleKit/scripts |
115 | script_SCRIPTS = \ |
116 | ck-system-stop \ |
117 | ck-system-restart \ |
118 | -- |
119 | 1.6.5.rc1 |
120 |