diff options
| author | Eric Koegel <eric.koegel@gmail.com> | 2015-07-19 16:13:16 +0300 |
|---|---|---|
| committer | Eric Koegel <eric.koegel@gmail.com> | 2015-07-19 16:13:16 +0300 |
| commit | 9576ae77d076fed2dfa6443e27b742aa527edf90 (patch) | |
| tree | 55d399f089f5bcf4801f3e4677ed86ddfdcbdbf9 | |
| parent | 5c6b9d954c493237f99b8174037b72e1177e9d00 (diff) | |
| parent | 4d87a25ea0af1f8fe90de1f18866b166109deb18 (diff) | |
| download | ConsoleKit2-9576ae77d076fed2dfa6443e27b742aa527edf90.tar.gz | |
Merge pull request #31 from Somasis/master
Respect multilib/multiarch filesystem layouts
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/ck-manager.c | 10 | ||||
| -rw-r--r-- | tools/freebsd/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/linux/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/solaris/Makefile.am | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index f99079a..091ef27 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -369,8 +369,8 @@ MAINTAINERCLEANFILES = \ install-data-local: -mkdir -p $(DESTDIR)$(sysconfdir)/ConsoleKit/run-session.d - -mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-session.d + -mkdir -p $(DESTDIR)$(libdir)/ConsoleKit/run-session.d -mkdir -p $(DESTDIR)$(sysconfdir)/ConsoleKit/run-seat.d - -mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d + -mkdir -p $(DESTDIR)$(libdir)/ConsoleKit/run-seat.d -mkdir -p $(DESTDIR)$(RUNDIR)/ConsoleKit -mkdir -p $(DESTDIR)$(localstatedir)/log/ConsoleKit diff --git a/src/ck-manager.c b/src/ck-manager.c index d9d035a..f7e0b05 100644 --- a/src/ck-manager.c +++ b/src/ck-manager.c @@ -1342,7 +1342,7 @@ do_restart (CkManager *manager, data->manager = manager; data->context = context; - data->command = PREFIX "/lib/ConsoleKit/scripts/ck-system-restart"; + data->command = LIBDIR "/ConsoleKit/scripts/ck-system-restart"; data->event_type = CK_LOG_EVENT_SYSTEM_RESTART; data->description = "Restart"; data->signal = PREPARE_FOR_SHUTDOWN; @@ -1449,7 +1449,7 @@ do_stop (CkManager *manager, data->manager = manager; data->context = context; - data->command = PREFIX "/lib/ConsoleKit/scripts/ck-system-stop"; + data->command = LIBDIR "/ConsoleKit/scripts/ck-system-stop"; data->event_type = CK_LOG_EVENT_SYSTEM_STOP; data->description = "Stop"; data->signal = PREPARE_FOR_SHUTDOWN; @@ -1704,7 +1704,7 @@ do_suspend (CkManager *manager, data->manager = manager; data->context = context; - data->command = PREFIX "/lib/ConsoleKit/scripts/ck-system-suspend"; + data->command = LIBDIR "/ConsoleKit/scripts/ck-system-suspend"; data->event_type = CK_LOG_EVENT_SYSTEM_SUSPEND; data->description = "Suspend"; data->signal = PREPARE_FOR_SLEEP; @@ -1836,7 +1836,7 @@ do_hibernate (CkManager *manager, data->manager = manager; data->context = context; - data->command = PREFIX "/lib/ConsoleKit/scripts/ck-system-hibernate"; + data->command = LIBDIR "/ConsoleKit/scripts/ck-system-hibernate"; data->event_type = CK_LOG_EVENT_SYSTEM_HIBERNATE; data->description = "Hibernate"; data->signal = PREPARE_FOR_SLEEP; @@ -1968,7 +1968,7 @@ do_hybrid_sleep (CkManager *manager, data->manager = manager; data->context = context; - data->command = PREFIX "/lib/ConsoleKit/scripts/ck-system-hybridsleep"; + data->command = LIBDIR "/ConsoleKit/scripts/ck-system-hybridsleep"; data->event_type = CK_LOG_EVENT_SYSTEM_HIBERNATE; data->description = "Hybrid Sleep"; data->signal = PREPARE_FOR_SLEEP; diff --git a/tools/freebsd/Makefile.am b/tools/freebsd/Makefile.am index b06d00c..70b64a6 100644 --- a/tools/freebsd/Makefile.am +++ b/tools/freebsd/Makefile.am @@ -6,7 +6,7 @@ NULL = SUBDIRS = \ $(NULL) -scriptdir = $(prefix)/lib/ConsoleKit/scripts +scriptdir = $(libdir)/ConsoleKit/scripts script_SCRIPTS = \ ck-system-stop \ ck-system-restart \ diff --git a/tools/linux/Makefile.am b/tools/linux/Makefile.am index 26a9a11..aef2c6d 100644 --- a/tools/linux/Makefile.am +++ b/tools/linux/Makefile.am @@ -6,7 +6,7 @@ NULL = SUBDIRS = \ $(NULL) -scriptdir = $(prefix)/lib/ConsoleKit/scripts +scriptdir = $(libdir)/ConsoleKit/scripts script_SCRIPTS = \ ck-system-stop \ ck-system-restart \ diff --git a/tools/solaris/Makefile.am b/tools/solaris/Makefile.am index 85a7166..b4c1d49 100644 --- a/tools/solaris/Makefile.am +++ b/tools/solaris/Makefile.am @@ -6,7 +6,7 @@ NULL = SUBDIRS = \ $(NULL) -scriptdir = $(prefix)/lib/ConsoleKit/scripts +scriptdir = $(libdir)/ConsoleKit/scripts script_SCRIPTS = \ ck-system-stop \ ck-system-restart \ |