Git Repositories

Allow installation of the helpers in a custom location.
authorGuido Berhoerster <gber@opensuse.org>
Sat, 12 Feb 2011 16:28:22 +0000 (17:28 +0100)
committerNick Schermer <nick@xfce.org>
Sat, 12 Feb 2011 16:28:22 +0000 (17:28 +0100)
Makefile.am
Thunar-bulk-rename.desktop.in.in
configure.in.in
plugins/thunar-sendto-email/Makefile.am
plugins/thunar-sendto-email/thunar-sendto-email.desktop.in.in
plugins/thunar-wallpaper/Makefile.am
thunar/Makefile.am
thunar/thunar-dialogs.c

index ec569b5..226de97 100644 (file)
@@ -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@
 
index df8d58b..2e1299d 100644 (file)
@@ -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
index 57181fc..b97a5ac 100644 (file)
@@ -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 ***********************************************
index ed03664..935b1f3 100644 (file)
@@ -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@
 
index 495ef5e..539c785 100644 (file)
@@ -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
index 9455670..68edea1 100644 (file)
@@ -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
 
index 70d6df5..0b45ce9 100644 (file)
@@ -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                                         \
index 039f40d..576252b 100644 (file)
@@ -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))