diff options
| author | Guido Berhoerster <gber@opensuse.org> | 2011-02-12 17:40:27 +0100 |
|---|---|---|
| committer | Nick Schermer <nick@xfce.org> | 2011-02-12 17:40:27 +0100 |
| commit | 5e33fa8a36e9646208dfcb911e6b9419dc10019f (patch) | |
| tree | c6f5afbbe8a14a7cbef1c86942ca10356f96854c | |
| parent | 2b3cbf5aef1d758e73f0285e9637a106333603f8 (diff) | |
| download | xfce4-session-5e33fa8a36e9646208dfcb911e6b9419dc10019f.tar.gz | |
Allow installation of the helpers in a custom location.
| -rw-r--r-- | configure.in.in | 8 | ||||
| -rw-r--r-- | engines/balou/Makefile.am | 4 | ||||
| -rw-r--r-- | engines/balou/scripts/Makefile.am | 2 | ||||
| -rw-r--r-- | xfce4-session/Makefile.am | 2 | ||||
| -rw-r--r-- | xfsm-shutdown-helper/Makefile.am | 2 |
5 files changed, 13 insertions, 5 deletions
diff --git a/configure.in.in b/configure.in.in index b2c87262..480ec552 100644 --- a/configure.in.in +++ b/configure.in.in @@ -32,6 +32,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_USE_SYSTEM_EXTENSIONS AM_CONDITIONAL([HAVE_OS_CYGWIN], [test x"`uname | grep \"CYGWIN\"`" != x""]) diff --git a/engines/balou/Makefile.am b/engines/balou/Makefile.am index 6b98998b..96ae5c5f 100644 --- a/engines/balou/Makefile.am +++ b/engines/balou/Makefile.am @@ -20,8 +20,8 @@ libbalou_la_CFLAGS = \ -I$(top_srcdir) \ $(LIBXFCE4UI_CFLAGS) \ $(XFCONF_CFLAGS) \ - -DBALOU_EXPORT_THEME=\"$(libdir)/xfce4/session/balou-export-theme\" \ - -DBALOU_INSTALL_THEME=\"$(libdir)/xfce4/session/balou-install-theme\" + -DBALOU_EXPORT_THEME=\"$(HELPER_PATH_PREFIX)/xfce4/session/balou-export-theme\" \ + -DBALOU_INSTALL_THEME=\"$(HELPER_PATH_PREFIX)/xfce4/session/balou-install-theme\" libbalou_la_LDFLAGS = \ -avoid-version \ diff --git a/engines/balou/scripts/Makefile.am b/engines/balou/scripts/Makefile.am index 858ab376..0ccf8eae 100644 --- a/engines/balou/scripts/Makefile.am +++ b/engines/balou/scripts/Makefile.am @@ -1,4 +1,4 @@ -baloursciptsdir = $(libdir)/xfce4/session +baloursciptsdir = $(HELPER_PATH_PREFIX)/xfce4/session balourscipts_SCRIPTS = \ balou-export-theme \ balou-install-theme diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am index 3ea938c1..b9240518 100644 --- a/xfce4-session/Makefile.am +++ b/xfce4-session/Makefile.am @@ -65,7 +65,7 @@ xfce4_session_CFLAGS = \ -DLIBDIR=\"$(libdir)\" \ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ - -DXFSM_SHUTDOWN_HELPER_CMD=\"$(libdir)/xfce4/session/xfsm-shutdown-helper\" + -DXFSM_SHUTDOWN_HELPER_CMD=\"$(HELPER_PATH_PREFIX)/xfce4/session/xfsm-shutdown-helper\" xfce4_session_LDADD = \ $(top_builddir)/libxfsm/libxfsm-4.6.la \ diff --git a/xfsm-shutdown-helper/Makefile.am b/xfsm-shutdown-helper/Makefile.am index 9a89eec4..f64b5baa 100644 --- a/xfsm-shutdown-helper/Makefile.am +++ b/xfsm-shutdown-helper/Makefile.am @@ -1,4 +1,4 @@ -xfsm_shutdown_helperdir = $(libdir)/xfce4/session +xfsm_shutdown_helperdir = $(HELPER_PATH_PREFIX)/xfce4/session xfsm_shutdown_helper_PROGRAMS = \ xfsm-shutdown-helper |