Updating branch refs/heads/master to 26d6c13238f21f0967aa0ad4506e433934558c2e (commit) from 303037c1615657b675ce99917a55d86e93e324a3 (commit)
commit 26d6c13238f21f0967aa0ad4506e433934558c2e Author: Guido Berhoerster <g...@opensuse.org> Date: Sat Feb 12 17:28:22 2011 +0100 Allow installation of the helpers in a custom location. Makefile.am | 4 ++-- Thunar-bulk-rename.desktop.in.in | 2 +- configure.in.in | 10 ++++++++++ plugins/thunar-sendto-email/Makefile.am | 4 ++-- .../thunar-sendto-email.desktop.in.in | 2 +- plugins/thunar-wallpaper/Makefile.am | 2 +- thunar/Makefile.am | 1 + thunar/thunar-dialogs.c | 2 +- 8 files changed, 19 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index ec569b5..226de97 100644 --- a/Makefile.am +++ b/Makefile.am @@ -44,7 +44,7 @@ ChangeLog: Makefile dist-hook: ChangeLog -thunar_scriptsdir = $(libdir)/Thunar +thunar_scriptsdir = $(HELPER_PATH_PREFIX)/Thunar thunar_scripts_SCRIPTS = \ ThunarBulkRename \ ThunarHelp @@ -74,7 +74,7 @@ desktop_in_in_files = \ Thunar-folder-handler.desktop.in.in desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) %.desktop.in: %.desktop.in.in - $(AM_V_GEN) sed -e "s,\@libdir\@,$(libdir),g" < $< > $@ + $(AM_V_GEN) sed -e "s,\@HELPERDIR\@,$(HELPER_PATH_PREFIX),g" < $< > $@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ diff --git a/Thunar-bulk-rename.desktop.in.in b/Thunar-bulk-rename.desktop.in.in index df8d58b..2e1299d 100644 --- a/Thunar-bulk-rename.desktop.in.in +++ b/Thunar-bulk-rename.desktop.in.in @@ -2,7 +2,7 @@ _Name=Bulk Rename _Comment=Rename Multiple Files _GenericName=Bulk Rename -Exec=@libdir@/Thunar/ThunarBulkRename %F +Exec=@HELPERDIR@/Thunar/ThunarBulkRename %F Icon=Thunar Terminal=false StartupNotify=true diff --git a/configure.in.in b/configure.in.in index 57181fc..b97a5ac 100644 --- a/configure.in.in +++ b/configure.in.in @@ -94,6 +94,16 @@ AC_SUBST([THUNAR_VERSION_MAJOR]) AC_SUBST([THUNAR_VERSION_MINOR]) AC_SUBST([THUNAR_VERSION_MICRO]) +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 *** Determine the u32 type required for tdb *** dnl *********************************************** diff --git a/plugins/thunar-sendto-email/Makefile.am b/plugins/thunar-sendto-email/Makefile.am index ed03664..935b1f3 100644 --- a/plugins/thunar-sendto-email/Makefile.am +++ b/plugins/thunar-sendto-email/Makefile.am @@ -10,7 +10,7 @@ INCLUDES = \ $(PLATFORM_CPPFLAGS) thunar_sendto_emaildir = \ - $(libdir)/Thunar + $(HELPER_PATH_PREFIX)/Thunar thunar_sendto_email_PROGRAMS = \ thunar-sendto-email @@ -30,7 +30,7 @@ desktopdir = $(datadir)/Thunar/sendto desktop_in_in_files = thunar-sendto-email.desktop.in.in desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) %.desktop.in: %.desktop.in.in - sed -e "s,\@libdir\@,$(libdir),g" < $< > $@ + sed -e "s,\@HELPERDIR\@,$(HELPER_PATH_PREFIX),g" < $< > $@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ diff --git a/plugins/thunar-sendto-email/thunar-sendto-email.desktop.in.in b/plugins/thunar-sendto-email/thunar-sendto-email.desktop.in.in index 495ef5e..539c785 100644 --- a/plugins/thunar-sendto-email/thunar-sendto-email.desktop.in.in +++ b/plugins/thunar-sendto-email/thunar-sendto-email.desktop.in.in @@ -3,4 +3,4 @@ Type=Application Version=1.0 _Name=Mail Recipient Icon=internet-mail -Exec=@libdir@/Thunar/thunar-sendto-email %F +Exec=@HELPERDIR@/Thunar/thunar-sendto-email %F diff --git a/plugins/thunar-wallpaper/Makefile.am b/plugins/thunar-wallpaper/Makefile.am index 9455670..68edea1 100644 --- a/plugins/thunar-wallpaper/Makefile.am +++ b/plugins/thunar-wallpaper/Makefile.am @@ -35,7 +35,7 @@ thunar_wallpaper_plugin_la_LIBADD = \ $(GLIB_LIBS) \ $(GTK_LIBS) \ $(LIBX11_LIBS) - + thunar_wallpaper_plugin_la_DEPENDENCIES = \ $(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la diff --git a/thunar/Makefile.am b/thunar/Makefile.am index 70d6df5..0b45ce9 100644 --- a/thunar/Makefile.am +++ b/thunar/Makefile.am @@ -8,6 +8,7 @@ INCLUDES = \ -DEXO_DISABLE_DEPRECATED \ -DG_LOG_DOMAIN=\"Thunar\" \ -DLIBDIR=\"$(libdir)\" \ + -DHELPERDIR=\"$(HELPER_PATH_PREFIX)\" \ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ -DTHUNAR_VERSION_API=\"$(THUNAR_VERSION_API)\" \ -DSN_API_NOT_YET_FROZEN \ diff --git a/thunar/thunar-dialogs.c b/thunar/thunar-dialogs.c index 039f40d..576252b 100644 --- a/thunar/thunar-dialogs.c +++ b/thunar/thunar-dialogs.c @@ -349,7 +349,7 @@ thunar_dialogs_show_help (gpointer parent, screen = thunar_util_parse_parent (parent, NULL); /* generate the command for the documentation browser */ - command = g_strdup (LIBDIR G_DIR_SEPARATOR_S "Thunar" G_DIR_SEPARATOR_S "ThunarHelp"); + command = g_strdup (HELPERDIR G_DIR_SEPARATOR_S "Thunar" G_DIR_SEPARATOR_S "ThunarHelp"); /* check if a page is given */ if (G_UNLIKELY (page != NULL)) _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits