File thunar-allow-custom-helper-dir.patch of Package thunar
diff -ur Thunar-1.2.2.orig/configure.in Thunar-1.2.2/configure.in --- Thunar-1.2.2.orig/configure.in 2011-05-27 00:11:37.000000000 +0200 +++ Thunar-1.2.2/configure.in 2011-07-19 17:32:59.000000000 +0200 @@ -99,6 +99,13 @@ AC_SUBST([THUNAR_VERSION_MINOR]) AC_SUBST([THUNAR_VERSION_MICRO]) +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 -ur Thunar-1.2.2.orig/Makefile.am Thunar-1.2.2/Makefile.am --- Thunar-1.2.2.orig/Makefile.am 2011-05-26 23:51:40.000000000 +0200 +++ Thunar-1.2.2/Makefile.am 2011-07-19 17:32:59.000000000 +0200 @@ -44,7 +44,7 @@ dist-hook: ChangeLog -thunar_scriptsdir = $(libdir)/Thunar +thunar_scriptsdir = $(HELPER_PATH_PREFIX)/Thunar thunar_scripts_SCRIPTS = \ ThunarBulkRename \ ThunarHelp @@ -74,7 +74,7 @@ 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 -ur Thunar-1.2.2.orig/plugins/thunar-sendto-email/Makefile.am Thunar-1.2.2/plugins/thunar-sendto-email/Makefile.am --- Thunar-1.2.2.orig/plugins/thunar-sendto-email/Makefile.am 2011-05-26 23:51:40.000000000 +0200 +++ Thunar-1.2.2/plugins/thunar-sendto-email/Makefile.am 2011-07-19 17:32:59.000000000 +0200 @@ -10,7 +10,7 @@ $(PLATFORM_CPPFLAGS) thunar_sendto_emaildir = \ - $(libdir)/Thunar + $(HELPER_PATH_PREFIX)/Thunar thunar_sendto_email_PROGRAMS = \ thunar-sendto-email @@ -30,7 +30,7 @@ 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 -ur Thunar-1.2.2.orig/plugins/thunar-sendto-email/thunar-sendto-email.desktop.in.in Thunar-1.2.2/plugins/thunar-sendto-email/thunar-sendto-email.desktop.in.in --- Thunar-1.2.2.orig/plugins/thunar-sendto-email/thunar-sendto-email.desktop.in.in 2011-05-26 23:51:40.000000000 +0200 +++ Thunar-1.2.2/plugins/thunar-sendto-email/thunar-sendto-email.desktop.in.in 2011-07-19 17:32:59.000000000 +0200 @@ -3,4 +3,4 @@ Version=1.0 _Name=Mail Recipient Icon=internet-mail -Exec=@libdir@/Thunar/thunar-sendto-email %F +Exec=@HELPERDIR@/Thunar/thunar-sendto-email %F diff -ur Thunar-1.2.2.orig/plugins/thunar-wallpaper/Makefile.am Thunar-1.2.2/plugins/thunar-wallpaper/Makefile.am --- Thunar-1.2.2.orig/plugins/thunar-wallpaper/Makefile.am 2011-05-26 23:51:40.000000000 +0200 +++ Thunar-1.2.2/plugins/thunar-wallpaper/Makefile.am 2011-07-19 17:32:59.000000000 +0200 @@ -35,7 +35,7 @@ $(GLIB_LIBS) \ $(GTK_LIBS) \ $(LIBX11_LIBS) - + thunar_wallpaper_plugin_la_DEPENDENCIES = \ $(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la diff -ur Thunar-1.2.2.orig/thunar/Makefile.am Thunar-1.2.2/thunar/Makefile.am --- Thunar-1.2.2.orig/thunar/Makefile.am 2011-05-26 23:51:41.000000000 +0200 +++ Thunar-1.2.2/thunar/Makefile.am 2011-07-19 17:32:59.000000000 +0200 @@ -8,6 +8,7 @@ -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 -ur Thunar-1.2.2.orig/thunar/thunar-dialogs.c Thunar-1.2.2/thunar/thunar-dialogs.c --- Thunar-1.2.2.orig/thunar/thunar-dialogs.c 2011-05-26 23:51:41.000000000 +0200 +++ Thunar-1.2.2/thunar/thunar-dialogs.c 2011-07-19 17:32:59.000000000 +0200 @@ -349,7 +349,7 @@ 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)) diff -ur Thunar-1.2.2.orig/Thunar-bulk-rename.desktop.in.in Thunar-1.2.2/Thunar-bulk-rename.desktop.in.in --- Thunar-1.2.2.orig/Thunar-bulk-rename.desktop.in.in 2011-05-26 23:51:40.000000000 +0200 +++ Thunar-1.2.2/Thunar-bulk-rename.desktop.in.in 2011-07-19 17:32:59.000000000 +0200 @@ -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
