[gnome-screensaver/gnome-2-30] Fix distcheck



commit d24efc002b09d3f4e49f043c22e3871c0a1a60ed
Author: Ray Strode <rstrode redhat com>
Date:   Tue Sep 28 16:26:36 2010 -0400

    Fix distcheck
    
    pkg-config returns a directory with /usr/share in it, so it breaks
    "make install" to non-system-root directories.
    
    The autoconf manually recommends evil sed hacks here.
    (cherry picked from commit 4189b03936499a8b9390c7b0a19235bf01a981e0)

 configure.ac |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6b40af5..2ad05ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -149,7 +149,8 @@ else
 fi
 
 # Find out where the session service file goes
-DBUS_SESSION_SERVICE_DIR=`pkg-config --variable session_bus_services_dir dbus-1`
+# The sad sed hack is recomended by section 27.10 of the automake manual.
+DBUS_SESSION_SERVICE_DIR=`pkg-config --variable session_bus_services_dir dbus-1 | sed -e 's,/usr/share,${datarootdir},g`
 AC_SUBST(DBUS_SESSION_SERVICE_DIR)
 
 # Determine PAM prefix



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]