[Xfce4-commits] <thunar:master> Move helpers from $libexecdir to $libdir/Thunar.

[Nick Schermer]

Updating branch refs/heads/master
         to be47687faab010299fc926b97599d114a909787f (commit)
       from 3826f7e5f812879251231724784c5d27f8c91a2a (commit)

commit be47687faab010299fc926b97599d114a909787f
Author: Nick Schermer <nick at xfce.org>
Date:   Thu Aug 26 20:06:12 2010 +0200

    Move helpers from $libexecdir to $libdir/Thunar.
    
    FHS 2.3 forbids files in $libexecdir, so install the files in $libdir.

 Makefile.am                                        |    5 +++--
 Thunar-bulk-rename.desktop.in.in                   |    2 +-
 Thunar.spec.in                                     |    1 -
 plugins/thunar-sendto-email/Makefile.am            |    7 +++++--
 .../thunar-sendto-email.desktop.in.in              |    2 +-
 plugins/thunar-wallpaper/Makefile.am               |    1 -
 thunar/Makefile.am                                 |    1 -
 thunar/thunar-dialogs.c                            |    2 +-
 8 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 85226d5..356e633 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,7 +45,8 @@ ChangeLog: Makefile
 
 dist-hook: ChangeLog
 
-libexec_SCRIPTS =							\
+thunar_scriptsdir = $(libdir)/Thunar
+thunar_scripts_SCRIPTS =							\
 	ThunarBulkRename						\
 	ThunarHelp
 
@@ -74,7 +75,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,\@libexecdir\@,$(libexecdir),g" < $< > $@
+	$(AM_V_GEN) sed -e "s,\@libdir\@,$(libdir),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 7558c90..5239d92 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=@libexecdir@/ThunarBulkRename %F
+Exec=@libdir@/Thunar/ThunarBulkRename %F
 Icon=Thunar
 Terminal=false
 StartupNotify=true
diff --git a/Thunar.spec.in b/Thunar.spec.in
index ff0c127..f3b01ab 100644
--- a/Thunar.spec.in
+++ b/Thunar.spec.in
@@ -66,6 +66,5 @@ fi
 %{_datadir}/
 %{_includedir}/
 %{_libdir}/
-%{_libexecdir}/
 %{_mandir}/
 %{_sysconfdir}/
diff --git a/plugins/thunar-sendto-email/Makefile.am b/plugins/thunar-sendto-email/Makefile.am
index ac66591..ed03664 100644
--- a/plugins/thunar-sendto-email/Makefile.am
+++ b/plugins/thunar-sendto-email/Makefile.am
@@ -9,7 +9,10 @@ INCLUDES =								\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
 	$(PLATFORM_CPPFLAGS)
 
-libexec_PROGRAMS =							\
+thunar_sendto_emaildir =						\
+	$(libdir)/Thunar
+
+thunar_sendto_email_PROGRAMS =						\
 	thunar-sendto-email
 
 thunar_sendto_email_SOURCES =						\
@@ -27,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,\@libexecdir\@,$(libexecdir),g" < $< > $@
+	sed -e "s,\@libdir\@,$(libdir),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 fbaf686..495ef5e 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=@libexecdir@/thunar-sendto-email %F
+Exec=@libdir@/Thunar/thunar-sendto-email %F
diff --git a/plugins/thunar-wallpaper/Makefile.am b/plugins/thunar-wallpaper/Makefile.am
index 3a549fa..5846794 100644
--- a/plugins/thunar-wallpaper/Makefile.am
+++ b/plugins/thunar-wallpaper/Makefile.am
@@ -3,7 +3,6 @@ INCLUDES =								\
 	-I$(top_srcdir)							\
 	-DG_LOG_DOMAIN=\"thunar-wallpaper-plugin\"			\
 	-DEXO_API_SUBJECT_TO_CHANGE					\
-	-DLIBEXECDIR=\"$(libexecdir)\"					\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
 	$(PLATFORM_CPPFLAGS)
 
diff --git a/thunar/Makefile.am b/thunar/Makefile.am
index 29923e5..70d6df5 100644
--- a/thunar/Makefile.am
+++ b/thunar/Makefile.am
@@ -8,7 +8,6 @@ INCLUDES =								\
 	-DEXO_DISABLE_DEPRECATED					\
 	-DG_LOG_DOMAIN=\"Thunar\"					\
 	-DLIBDIR=\"$(libdir)\"						\
-	-DLIBEXECDIR=\"$(libexecdir)\"					\
 	-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 fecaac4..c1a397a 100644
--- a/thunar/thunar-dialogs.c
+++ b/thunar/thunar-dialogs.c
@@ -338,7 +338,7 @@ thunar_dialogs_show_help (gpointer     parent,
   screen = thunar_util_parse_parent (parent, NULL);
 
   /* generate the command for the documentation browser */
-  command = g_strdup (LIBEXECDIR "/ThunarHelp");
+  command = g_strdup (LIBDIR G_DIR_SEPARATOR_S "Thunar" G_DIR_SEPARATOR_S "ThunarHelp");
 
   /* check if a page is given */
   if (G_UNLIKELY (page != NULL))