Updating branch refs/heads/master
to 1c42d2ec9f7fc562444989f619c6eeba80ac7629 (commit)
from 4a52a77eecc7e4d88ac3ce307803a2f7a68b8897 (commit)
commit 1c42d2ec9f7fc562444989f619c6eeba80ac7629
Author: Guido Berhoerster <g...@opensuse.org>
Date: Sat Feb 12 17:42:49 2011 +0100
Allow installation of the helpers in a custom location.
configure.ac.in | 8 ++++++++
helper-dialog/Makefile.am | 2 +-
src/Makefile.am | 2 +-
src/terminate.c | 2 +-
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index f52ea7f..85806e9 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -34,6 +34,14 @@ AM_CONFIG_HEADER([config.h])
AM_MAINTAINER_MODE()
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+dnl set helper path prefix
+AC_ARG_WITH([helper-path-prefix],
+ [AC_HELP_STRING([--with-helper-path-prefix=PATH],
+ [Path prefix under which helper executables will
be installed (default: $libdir)])],
+ [HELPER_PATH_PREFIX="$withval"],
+ [HELPER_PATH_PREFIX="$libdir"])
+AC_SUBST([HELPER_PATH_PREFIX])
+
dnl check for UNIX variants
AC_AIX
AC_ISC_POSIX
diff --git a/helper-dialog/Makefile.am b/helper-dialog/Makefile.am
index 09727c6..0dd8930 100644
--- a/helper-dialog/Makefile.am
+++ b/helper-dialog/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES =
\
$(LIBX11_CFLAGS) \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
-helper_dialogdir = $(libdir)/xfce4/xfwm4
+helper_dialogdir = $(HELPER_PATH_PREFIX)/xfce4/xfwm4
helper_dialog_PROGRAMS = \
helper-dialog
diff --git a/src/Makefile.am b/src/Makefile.am
index 9cf486c..10280a9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -92,7 +92,7 @@ xfwm4_CFLAGS =
\
$(COMPOSITOR_CFLAGS) \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
-DDATADIR=\"$(datadir)\" \
- -DLIBDIR=\"$(libdir)\" \
+ -DHELPERDIR=\"$(HELPER_PATH_PREFIX)\" \
-DPACKAGE_DATADIR=\"$(pkgdatadir)\" \
-DG_LOG_DOMAIN=\"xfwm4\"
diff --git a/src/terminate.c b/src/terminate.c
index 69692b9..6d18243 100644
--- a/src/terminate.c
+++ b/src/terminate.c
@@ -110,7 +110,7 @@ terminateShowDialog (Client *c)
screen_info = c->screen_info;
xid = g_strdup_printf ("0x%lx", c->window);
- argv[0] = LIBDIR "/xfce4/xfwm4/helper-dialog";
+ argv[0] = HELPERDIR "/xfce4/xfwm4/helper-dialog";
argv[1] = xid;
argv[2] = c->name;
argv[3] = NULL;
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
