[Xfce4-commits] [xfce/libxfce4ui] 01/01: Fix make distcheck with gladeui2 install path

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

e   r   i   c       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/libxfce4ui.

commit 408df96e51b1c037a3b7433c355277b6667dda7a
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Sun Jul 2 15:40:21 2017 +0300

    Fix make distcheck with gladeui2 install path
    
    Switch to using the datarootdir so we honor $prefix.
---
 configure.ac.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 6120178..aecd8f1 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -236,17 +236,17 @@ AC_SUBST([GLADEUI_PIXMAPDIR])
 
 if test x"$GLADEUI2_FOUND" = x"yes"; then
   if test x"$gladeui2_catalogdir" = x""; then
-    GLADEUI2_CATALOGDIR=`$PKG_CONFIG "--variable=catalogdir" "gladeui-2.0"`
+    GLADEUI2_CATALOGDIR="${datarootdir}/glade/catalogs"
   else
     GLADEUI2_CATALOGDIR="$gladeui_catalogdir"
   fi
   if test x"$gladeui2_moduledir" = x""; then
-    GLADEUI2_MODULEDIR=`$PKG_CONFIG "--variable=moduledir" "gladeui-2.0"`
+    GLADEUI2_MODULEDIR="${datarootdir}/glade/modules"
   else
     GLADEUI2_MODULEDIR="$gladeui_moduledir"
   fi
   if test x"$gladeui2_pixmapdir" = x""; then
-    GLADEUI2_PIXMAPDIR=`$PKG_CONFIG "--variable=pixmapdir" "gladeui-2.0"`
+    GLADEUI2_PIXMAPDIR="${datarootdir}/glade/pixmaps"
   else
     GLADEUI2_PIXMAPDIR="$gladeui_pixmapdir"
   fi

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.