[Xfce4-commits] <xfwm4:master> Move helper-dialog to $libdir/xfce4/xfwm4.

[Nick Schermer]

Updating branch refs/heads/master
         to e2aa2cac262726996f02f0f81686241c55f35254 (commit)
       from 07cf05dffef3526e7b75dd31466ff27b214920bd (commit)

commit e2aa2cac262726996f02f0f81686241c55f35254
Author: Nick Schermer <nick at xfce.org>
Date:   Thu Aug 26 20:43:17 2010 +0200

    Move helper-dialog to $libdir/xfce4/xfwm4.
    
    FHS 2.3 does not allow to install in $libexecdir.

 helper-dialog/Makefile.am |    2 +-
 src/Makefile.am           |    2 +-
 src/terminate.c           |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/helper-dialog/Makefile.am b/helper-dialog/Makefile.am
index 7f20223..09727c6 100644
--- a/helper-dialog/Makefile.am
+++ b/helper-dialog/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES =								\
 	$(LIBX11_CFLAGS)						\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
 
-helper_dialogdir = $(libexecdir)/xfce4/xfwm4
+helper_dialogdir = $(libdir)/xfce4/xfwm4
 
 helper_dialog_PROGRAMS =						\
 	helper-dialog
diff --git a/src/Makefile.am b/src/Makefile.am
index cc3cb36..11a4f99 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -92,7 +92,7 @@ xfwm4_CFLAGS =								\
 	$(COMPOSITOR_CFLAGS)						\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
 	-DDATADIR=\"$(datadir)\"					\
-	-DLIBEXECDIR=\"$(libexecdir)\"					\
+	-DLIBDIR=\"$(libdir)\"						\
 	-DPACKAGE_DATADIR=\"$(pkgdatadir)\"
 
 xfwm4_LDADD =								\
diff --git a/src/terminate.c b/src/terminate.c
index e4f59df..af9c05c 100644
--- a/src/terminate.c
+++ b/src/terminate.c
@@ -110,7 +110,7 @@ terminateShowDialog (Client *c)
     screen_info = c->screen_info;
     xid = g_strdup_printf ("0x%lx", c->window);
 
-    argv[0] = LIBEXECDIR"/xfce4/xfwm4/helper-dialog";
+    argv[0] = LIBDIR "/xfce4/xfwm4/helper-dialog";
     argv[1] = xid;
     argv[2] = c->name;
     argv[3] = NULL;