Updating branch refs/heads/xfce-4.8 to eb652080222e4a6184b60efb9f6a2cb9edca906c (commit) from e632fe399491128e85b3b68d83e8e56ed28ad60e (commit)
commit eb652080222e4a6184b60efb9f6a2cb9edca906c Author: Guido Berhoerster <g...@opensuse.org> Date: Sat Feb 12 17:29:49 2011 +0100 Allow installation of the helpers in a custom location. configure.ac.in | 10 ++++++++++ migrate/Makefile.am | 2 +- panel/Makefile.am | 1 + panel/panel-application.c | 2 +- panel/panel-plugin-external-wrapper.c | 2 +- wrapper/Makefile.am | 2 +- 6 files changed, 15 insertions(+), 4 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 9529bd2..c51d735 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -43,6 +43,16 @@ AM_INIT_AUTOMAKE([1.8 no-dist-gzip dist-bzip2 tar-ustar]) AM_MAINTAINER_MODE() m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +dnl ****************************** +dnl *** Set helper path prefix *** +dnl ****************************** +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 ******************************* dnl *** Check for UNIX variants *** dnl ******************************* diff --git a/migrate/Makefile.am b/migrate/Makefile.am index 4e53e05..3fa3195 100644 --- a/migrate/Makefile.am +++ b/migrate/Makefile.am @@ -10,7 +10,7 @@ confdir = $(sysconfdir)/xdg/xfce4/panel conf_DATA = \ default.xml -migratedir = $(libdir)/xfce4/panel +migratedir = $(HELPER_PATH_PREFIX)/xfce4/panel migrate_PROGRAMS = \ migrate diff --git a/panel/Makefile.am b/panel/Makefile.am index ef2b8ab..843bb6c 100644 --- a/panel/Makefile.am +++ b/panel/Makefile.am @@ -4,6 +4,7 @@ INCLUDES = \ -DG_LOG_DOMAIN=\"xfce4-panel\" \ -DDATADIR=\"$(datadir)/xfce4\" \ -DLIBDIR=\"$(libdir)/xfce4\" \ + -DHELPERDIR=\"$(HELPER_PATH_PREFIX)\" \ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ -DDBUS_API_SUBJECT_TO_CHANGE \ $(PLATFORM_CPPFLAGS) diff --git a/panel/panel-application.c b/panel/panel-application.c index a107f5a..d745069 100644 --- a/panel/panel-application.c +++ b/panel/panel-application.c @@ -50,7 +50,7 @@ #include <panel/panel-plugin-external.h> #define AUTOSAVE_INTERVAL (10 * 60) -#define MIGRATE_BIN LIBDIR G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S "migrate" +#define MIGRATE_BIN HELPERDIR G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S "migrate" diff --git a/panel/panel-plugin-external-wrapper.c b/panel/panel-plugin-external-wrapper.c index f4a3607..23c35cd 100644 --- a/panel/panel-plugin-external-wrapper.c +++ b/panel/panel-plugin-external-wrapper.c @@ -51,7 +51,7 @@ -#define WRAPPER_BIN LIBDIR G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S "wrapper" +#define WRAPPER_BIN HELPERDIR G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S "wrapper" diff --git a/wrapper/Makefile.am b/wrapper/Makefile.am index fd60c2d..3981587 100644 --- a/wrapper/Makefile.am +++ b/wrapper/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = \ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ $(PLATFORM_CPPFLAGS) -wrapperdir = $(libdir)/xfce4/panel +wrapperdir = $(HELPER_PATH_PREFIX)/xfce4/panel wrapper_PROGRAMS = \ wrapper _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits