Move MousepadHelp to $libdir/xfce4/mousepad.

codebrainz · Aug 26, 2010 · 3855352 · 3855352
1 parent a269c2d
commit 3855352
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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))