Skip to content
Snippets Groups Projects
Commit be47687f authored by Nick Schermer's avatar Nick Schermer
Browse files

Move helpers from $libexecdir to $libdir/Thunar.

FHS 2.3 forbids files in $libexecdir, so install the files in $libdir.
parent 3826f7e5
No related branches found
No related tags found
No related merge requests found
......@@ -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@
......
......@@ -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
......
......@@ -66,6 +66,5 @@ fi
%{_datadir}/
%{_includedir}/
%{_libdir}/
%{_libexecdir}/
%{_mandir}/
%{_sysconfdir}/
......@@ -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@
......
......@@ -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
......@@ -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)
......
......@@ -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 \
......
......@@ -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))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment