From 3c8db75b2ffdba1627a7030a4b57ce7ee8e474f2 Mon Sep 17 00:00:00 2001
From: William Jon McCann <jmccann@redhat.com>
Date: Fri, 18 Apr 2008 16:11:59 -0400
Subject: install scripts into $(prefix)/lib instead of $libdir

We don't want scripts going into lib64...
---
 src/Makefile.am           | 2 +-
 src/ck-manager.c          | 4 ++--
 src/ck-session.c          | 2 +-
 tools/freebsd/Makefile.am | 2 +-
 tools/linux/Makefile.am   | 2 +-
 tools/solaris/Makefile.am | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 8d5d83b..b5b8f08 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -199,6 +199,6 @@ MAINTAINERCLEANFILES =			\
 
 install-data-local:
 	-mkdir -p $(DESTDIR)$(sysconfdir)/ConsoleKit/run-session.d
-	-mkdir -p $(DESTDIR)$(libdir)/ConsoleKit/run-session.d
+	-mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-session.d
 	-mkdir -p $(DESTDIR)$(localstatedir)/run/ConsoleKit
 	-mkdir -p $(DESTDIR)$(localstatedir)/log/ConsoleKit
diff --git a/src/ck-manager.c b/src/ck-manager.c
index 0e4a7c9..c491e14 100644
--- a/src/ck-manager.c
+++ b/src/ck-manager.c
@@ -1358,7 +1358,7 @@ ck_manager_restart (CkManager             *manager,
         log_system_restart_event (manager);
 
         error = NULL;
-        res = g_spawn_command_line_async (LIBDIR "/ConsoleKit/scripts/ck-system-restart",
+        res = g_spawn_command_line_async (PREFIX "/lib/ConsoleKit/scripts/ck-system-restart",
                                           &error);
         if (! res) {
                 GError *new_error;
@@ -1416,7 +1416,7 @@ ck_manager_stop (CkManager             *manager,
         log_system_stop_event (manager);
 
         error = NULL;
-        res = g_spawn_command_line_async (LIBDIR "/ConsoleKit/scripts/ck-system-stop",
+        res = g_spawn_command_line_async (PREFIX "/lib/ConsoleKit/scripts/ck-system-stop",
                                           &error);
         if (! res) {
                 GError *new_error;
diff --git a/src/ck-session.c b/src/ck-session.c
index 52ee2c2..8ba8791 100644
--- a/src/ck-session.c
+++ b/src/ck-session.c
@@ -1284,7 +1284,7 @@ ck_session_run_programs (CkSession  *session,
         extra_env[n++] = NULL;
 
         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 (PREFIX "/lib/ConsoleKit/run-session.d", action, extra_env);
 
         for (n = 0; extra_env[n] != NULL; n++) {
                 g_free (extra_env[n]);
diff --git a/tools/freebsd/Makefile.am b/tools/freebsd/Makefile.am
index d25930e..f668722 100644
--- a/tools/freebsd/Makefile.am
+++ b/tools/freebsd/Makefile.am
@@ -6,7 +6,7 @@ NULL =
 SUBDIRS = \
 	$(NULL)
 
-scriptdir = $(libdir)/ConsoleKit/scripts
+scriptdir = $(prefix)/lib/ConsoleKit/scripts
 script_SCRIPTS =			\
 	ck-system-stop			\
 	ck-system-restart		\
diff --git a/tools/linux/Makefile.am b/tools/linux/Makefile.am
index 51196c0..c9e57db 100644
--- a/tools/linux/Makefile.am
+++ b/tools/linux/Makefile.am
@@ -6,7 +6,7 @@ NULL =
 SUBDIRS = \
 	$(NULL)
 
-scriptdir = $(libdir)/ConsoleKit/scripts
+scriptdir = $(libexecdir)/ConsoleKit/scripts
 script_SCRIPTS =			\
 	ck-system-stop	\
 	ck-system-restart		\
diff --git a/tools/solaris/Makefile.am b/tools/solaris/Makefile.am
index d25930e..d911e5d 100644
--- a/tools/solaris/Makefile.am
+++ b/tools/solaris/Makefile.am
@@ -6,7 +6,7 @@ NULL =
 SUBDIRS = \
 	$(NULL)
 
-scriptdir = $(libdir)/ConsoleKit/scripts
+scriptdir = $(libexecdir)/ConsoleKit/scripts
 script_SCRIPTS =			\
 	ck-system-stop			\
 	ck-system-restart		\
-- 
cgit