Updating branch refs/heads/master
to 3226cfc07572611f6c07ddbeb3f1a6a21a482857 (commit)
from e31ebbae23a1b17fc0f420a8f19f41675d43d273 (commit)
commit 3226cfc07572611f6c07ddbeb3f1a6a21a482857
Author: Nick Schermer <[email protected]>
Date: Thu Aug 26 18:47:35 2010 +0200
Move files from $libexecdir to $libdir.
FHS 2.3 does not allow files in $libexecdir, so move the helper
applications to $libdir/xfce4/exo-1.
exo-gio-module/Makefile.am | 2 +-
exo-gio-module/exo-module.c | 2 +-
exo-helper/Makefile.am | 11 +++++------
exo-helper/exo-preferred-applications.in | 2 +-
exo-helper/helpers/Makefile.am | 5 +++--
exo-helper/helpers/balsa.desktop.in.in | 2 +-
exo-helper/helpers/evolution.desktop.in.in | 2 +-
exo-helper/helpers/kmail.desktop.in.in | 2 +-
exo-helper/helpers/mozilla-mailer.desktop.in.in | 2 +-
exo-helper/helpers/mutt.desktop.in.in | 2 +-
exo-helper/helpers/sylpheed-claws.desktop.in.in | 2 +-
exo-helper/helpers/sylpheed.desktop.in.in | 2 +-
exo-helper/helpers/thunderbird.desktop.in.in | 2 +-
exo.spec.in | 2 +-
exo/Makefile.am | 2 +-
exo/exo-execute.c | 2 +-
16 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/exo-gio-module/Makefile.am b/exo-gio-module/Makefile.am
index 642623e..d5be7f8 100644
--- a/exo-gio-module/Makefile.am
+++ b/exo-gio-module/Makefile.am
@@ -2,8 +2,8 @@
INCLUDES = \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"exo-gio-module\" \
+ -DLIBDIR=\"$(libdir)/xfce4/exo-$(LIBEXO_VERSION_API)\" \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
- -DLIBEXECDIR=\"$(libexecdir)\" \
-DLIBEXO_VERSION_API=\"$(LIBEXO_VERSION_API)\"
if HAVE_GIO_UNIX
diff --git a/exo-gio-module/exo-module.c b/exo-gio-module/exo-module.c
index 6cf2511..898d453 100644
--- a/exo-gio-module/exo-module.c
+++ b/exo-gio-module/exo-module.c
@@ -24,7 +24,7 @@
#include <gio/gio.h>
#include <gio/gdesktopappinfo.h>
-#define EXO_HELPER_LAUNCH LIBEXECDIR "/exo-helper-" LIBEXO_VERSION_API "
--launch "
+#define EXO_HELPER_LAUNCH LIBDIR G_DIR_SEPARATOR_S "exo-helper-"
LIBEXO_VERSION_API " --launch "
diff --git a/exo-helper/Makefile.am b/exo-helper/Makefile.am
index 10ce11f..6594a0e 100644
--- a/exo-helper/Makefile.am
+++ b/exo-helper/Makefile.am
@@ -9,7 +9,9 @@ INCLUDES =
\
-DG_LOG_DOMAIN=\"exo-helper\" \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
-libexec_PROGRAMS = \
+exo_helperdir = $(libdir)/xfce4/exo-$(LIBEXO_VERSION_API)
+
+exo_helper_PROGRAMS = \
exo-helper-1
exo_helper_built_sources = \
@@ -51,11 +53,8 @@ bin_SCRIPTS =
\
exo-preferred-applications
exo-preferred-applications: Makefile $(srcdir)/exo-preferred-applications.in
- sed \
- -e 's,@libexecdir\@,$(libexecdir),g' \
- -e 's,@LIBEXO_VERSION_API\@,$(LIBEXO_VERSION_API),g' \
- < $(srcdir)/exo-preferred-applications.in \
- > exo-preferred-applications
+ sed -e 's,@libdir\@,$(libdir),g' \
+ -e 's,@LIBEXO_VERSION_API\@,$(LIBEXO_VERSION_API),g' < $< > $@
desktopdir = $(datadir)/applications
desktop_in_files = \
diff --git a/exo-helper/exo-preferred-applications.in
b/exo-helper/exo-preferred-applications.in
index ced7ff6..d2054b0 100644
--- a/exo-helper/exo-preferred-applications.in
+++ b/exo-helper/exo-preferred-applications.in
@@ -8,4 +8,4 @@
# Browser, Mail Reader and Terminal Emulator.
#
-exec @libexecdir@/exo-help...@libexo_version_api@ --configure "$@"
+exec @libdir@/xfce4/e...@libexo_version_api@/exo-help...@libexo_version_api@
--configure "$@"
diff --git a/exo-helper/helpers/Makefile.am b/exo-helper/helpers/Makefile.am
index 8a5445c..d53a5ed 100644
--- a/exo-helper/helpers/Makefile.am
+++ b/exo-helper/helpers/Makefile.am
@@ -40,10 +40,11 @@ desktop_in_in_files =
\
desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
%.desktop.in: %.desktop.in.in
- sed -e "s,\...@libexecdir\@,$(libexecdir),g" < $< > $@
+ sed -e 's,\...@helperdir\@,$(libdir)/xfce4/exo-$(LIBEXO_VERSION_API),g'
< $< > $@
@INTLTOOL_DESKTOP_RULE@
-libexec_SCRIPTS = \
+exo_composedir = $(libdir)/xfce4/exo-$(LIBEXO_VERSION_API)
+exo_compose_SCRIPTS = \
exo-compose-mail-$(LIBEXO_VERSION_API)
DISTCLEANFILES = \
diff --git a/exo-helper/helpers/balsa.desktop.in.in
b/exo-helper/helpers/balsa.desktop.in.in
index 5f67987..c945416 100644
--- a/exo-helper/helpers/balsa.desktop.in.in
+++ b/exo-helper/helpers/balsa.desktop.in.in
@@ -7,4 +7,4 @@ StartupNotify=false
X-XFCE-Binaries=balsa;
X-XFCE-Category=MailReader
X-XFCE-Commands=%B;
-x-xfce-commandswithparamet...@libexecdir@/exo-compose-mail-1 balsa %B
"mailto:%s";;
+x-xfce-commandswithparamet...@helperdir@/exo-compose-mail-1 balsa %B
"mailto:%s";;
diff --git a/exo-helper/helpers/evolution.desktop.in.in
b/exo-helper/helpers/evolution.desktop.in.in
index 6ea099b..32d3f35 100644
--- a/exo-helper/helpers/evolution.desktop.in.in
+++ b/exo-helper/helpers/evolution.desktop.in.in
@@ -7,4 +7,4 @@ StartupNotify=false
X-XFCE-Binaries=evolution-2.4;evolution-2.3;evolution-2.2;evolution-2.0;evolution-1.6;evolution-1.5;evolution-1.4;evolution;
X-XFCE-Category=MailReader
X-XFCE-Commands=%B;
-x-xfce-commandswithparamet...@libexecdir@/exo-compose-mail-1 evolution %B
"mailto:%s";;
+x-xfce-commandswithparamet...@helperdir@/exo-compose-mail-1 evolution %B
"mailto:%s";;
diff --git a/exo-helper/helpers/kmail.desktop.in.in
b/exo-helper/helpers/kmail.desktop.in.in
index 720d817..4f7035b 100644
--- a/exo-helper/helpers/kmail.desktop.in.in
+++ b/exo-helper/helpers/kmail.desktop.in.in
@@ -7,4 +7,4 @@ StartupNotify=true
X-XFCE-Binaries=kmail;
X-XFCE-Category=MailReader
X-XFCE-Commands=%B;
-x-xfce-commandswithparamt...@libexecdir@/exo-compose-mail-1 kmail %B
"mailto:%s";;
+x-xfce-commandswithparamt...@helperdir@/exo-compose-mail-1 kmail %B
"mailto:%s";;
diff --git a/exo-helper/helpers/mozilla-mailer.desktop.in.in
b/exo-helper/helpers/mozilla-mailer.desktop.in.in
index 77380d6..bcbf5f5 100644
--- a/exo-helper/helpers/mozilla-mailer.desktop.in.in
+++ b/exo-helper/helpers/mozilla-mailer.desktop.in.in
@@ -7,4 +7,4 @@ StartupNotify=false
X-XFCE-Binaries=mozilla;mozilla-gtk2;mozilla-gtk;
X-XFCE-Category=MailReader
X-XFCE-Commands=%B -mail;
-x-xfce-commandswithparamet...@libexecdir@/exo-compose-mail-1 mozilla-remote %B
"mailto:%s";@libexecdir@/exo-compose-mail-1 mozilla %B "mailto:%s";;
+x-xfce-commandswithparamet...@helperdir@/exo-compose-mail-1 mozilla-remote %B
"mailto:%s";@libexecdir@/exo-compose-mail-1 mozilla %B "mailto:%s";;
diff --git a/exo-helper/helpers/mutt.desktop.in.in
b/exo-helper/helpers/mutt.desktop.in.in
index cf95440..69b496d 100644
--- a/exo-helper/helpers/mutt.desktop.in.in
+++ b/exo-helper/helpers/mutt.desktop.in.in
@@ -7,4 +7,4 @@ StartupNotify=false
X-XFCE-Binaries=mutt;
X-XFCE-Category=MailReader
X-XFCE-Commands=exo-open --launch TerminalEmulator %B;
-X-XFCE-CommandsWithParameter=exo-open --launch TerminalEmulator
@libexecdir@/exo-compose-mail-1 mutt %B "mailto:%s";;
+X-XFCE-CommandsWithParameter=exo-open --launch TerminalEmulator
@HELPERDIR@/exo-compose-mail-1 mutt %B "mailto:%s";;
diff --git a/exo-helper/helpers/sylpheed-claws.desktop.in.in
b/exo-helper/helpers/sylpheed-claws.desktop.in.in
index df98ea5..7a0144e 100644
--- a/exo-helper/helpers/sylpheed-claws.desktop.in.in
+++ b/exo-helper/helpers/sylpheed-claws.desktop.in.in
@@ -7,4 +7,4 @@ StartupNotify=true
X-XFCE-Binaries=claws-mail;sylpheed-claws-gtk2;sylpheed-claws
X-XFCE-Category=MailReader
X-XFCE-Commands=%B;
-x-xfce-commandswithparamet...@libexecdir@/exo-compose-mail-1 sylpheed %B
"mailto:%s";;
+x-xfce-commandswithparamet...@helperdir@/exo-compose-mail-1 sylpheed %B
"mailto:%s";;
diff --git a/exo-helper/helpers/sylpheed.desktop.in.in
b/exo-helper/helpers/sylpheed.desktop.in.in
index dbeb16d..a6bc882 100644
--- a/exo-helper/helpers/sylpheed.desktop.in.in
+++ b/exo-helper/helpers/sylpheed.desktop.in.in
@@ -7,4 +7,4 @@ StartupNotify=true
X-XFCE-Binaries=sylpheed;
X-XFCE-Category=MailReader
X-XFCE-Commands=%B;
-x-xfce-commandswithparamet...@libexecdir@/exo-compose-mail-1 sylpheed %B
"mailto:%s";;
+x-xfce-commandswithparamet...@helperdir@/exo-compose-mail-1 sylpheed %B
"mailto:%s";;
diff --git a/exo-helper/helpers/thunderbird.desktop.in.in
b/exo-helper/helpers/thunderbird.desktop.in.in
index b1aee2a..5b5ea47 100644
--- a/exo-helper/helpers/thunderbird.desktop.in.in
+++ b/exo-helper/helpers/thunderbird.desktop.in.in
@@ -7,4 +7,4 @@ StartupNotify=false
X-XFCE-Binaries=thunderbird;thunderbird-gtk2;thunderbird-gtk;mozilla-thunderbird;
X-XFCE-Category=MailReader
X-XFCE-Commands=%B;
-x-xfce-commandswithparamet...@libexecdir@/exo-compose-mail-1 mozilla-remote %B
"mailto:%s";@libexecdir@/exo-compose-mail-1 mozilla %B "mailto:%s";;
+x-xfce-commandswithparamet...@helperdir@/exo-compose-mail-1 mozilla-remote %B
"mailto:%s";@libexecdir@/exo-compose-mail-1 mozilla %B "mailto:%s";;
diff --git a/exo.spec.in b/exo.spec.in
index 41c3adf..3ef14d9 100644
--- a/exo.spec.in
+++ b/exo.spec.in
@@ -64,7 +64,7 @@ fi
%{_datadir}/pixmaps
%{_datadir}/xfce4
%{_libdir}/lib*.so.*
-%{_libexecdir}
+%{_libdir}/xfce4
%{_mandir}/man1/exo-open.*
%{_sysconfdir}
diff --git a/exo/Makefile.am b/exo/Makefile.am
index a23bdc4..2fcfce2 100644
--- a/exo/Makefile.am
+++ b/exo/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES =
\
-DDATADIR=\"$(datadir)\" \
-DEXO_COMPILATION \
-DG_LOG_DOMAIN=\"exo\" \
- -DLIBEXECDIR=\"$(libexecdir)\" \
+ -DLIBDIR=\"$(libdir)/xfce4/exo-$(LIBEXO_VERSION_API)\" \
-DLIBEXO_VERSION_API=\"$(LIBEXO_VERSION_API)\" \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
diff --git a/exo/exo-execute.c b/exo/exo-execute.c
index 9a2dbf6..6ffd33c 100644
--- a/exo/exo-execute.c
+++ b/exo/exo-execute.c
@@ -131,7 +131,7 @@ exo_execute_preferred_application_on_screen (const gchar
*category,
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
/* generate the argument vector */
- argv[argc++] = LIBEXECDIR "/exo-helper-" LIBEXO_VERSION_API;
+ argv[argc++] = LIBDIR G_DIR_SEPARATOR_S "exo-helper-" LIBEXO_VERSION_API;
argv[argc++] = "--launch";
argv[argc++] = (gchar *) category;
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
