Updating branch refs/heads/nick_0_3
to 385535209b957746bec3d29818bc1d4490df35e3 (commit)
from a269c2d3c2f009925da47191f3eb7fec459072c1 (commit)
commit 385535209b957746bec3d29818bc1d4490df35e3
Author: Nick Schermer <[email protected]>
Date: Thu Aug 26 21:11:41 2010 +0200
Move MousepadHelp to $libdir/xfce4/mousepad.
Makefile.am | 3 ++-
mousepad/Makefile.am | 2 --
mousepad/mousepad-dialogs.c | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index ef80048..25a1d67 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,8 @@ rpm: dist
rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
@rm -f $(PACKAGE)-$(VERSION).tar.gz
-libexec_SCRIPTS =
\
+mousepad_scriptsdir = $(libdir)/xfce4/mousepad
+mousepad_scripts_SCRIPTS =
\
MousepadHelp
MousepadHelp: MousepadHelp.in Makefile
diff --git a/mousepad/Makefile.am b/mousepad/Makefile.am
index 762b248..a065629 100644
--- a/mousepad/Makefile.am
+++ b/mousepad/Makefile.am
@@ -4,9 +4,7 @@ INCLUDES = \
-DBINDIR=\"$(bindir)\" \
-DDATADIR=\"$(datadir)\" \
-DLIBDIR=\"$(libdir)\" \
- -DLIBEXECDIR=\"$(libexecdir)\" \
-DG_LOG_DOMAIN=\"Mousepad\" \
- -DLIBEXECDIR=\"$(libexecdir)\" \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
-DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \
-DGTK_DISABLE_SINGLE_INCLUDES \
diff --git a/mousepad/mousepad-dialogs.c b/mousepad/mousepad-dialogs.c
index 65fc9b9..28271d2 100644
--- a/mousepad/mousepad-dialogs.c
+++ b/mousepad/mousepad-dialogs.c
@@ -97,7 +97,7 @@ mousepad_dialogs_show_help (GtkWindow *parent,
screen = gdk_screen_get_default ();
/* generate the command for the documentation browser */
- command = g_strdup (LIBEXECDIR "/MousepadHelp");
+ command = g_strdup (LIBDIR G_DIR_SEPARATOR_S "xfce4" G_DIR_SEPARATOR_S
"mousepad" G_DIR_SEPARATOR_S "MousepadHelp");
/* check if a page is given */
if (G_UNLIKELY (page != NULL))
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
