[gtk-doc] cmake: Correctly perform bindir substitution.



commit 5f7b4431e17214ea05b090ad6cd9cd1b268769af
Author: Bruce Mitchener <bruce mitchener gmail com>
Date:   Wed Jan 3 11:56:24 2018 +0700

    cmake: Correctly perform bindir substitution.
    
    In the installed cmake config files, the bindir path needs to be
    absolute and without using the exec_prefix variable.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=792148

 cmake/Makefile.am |   11 +++++++++++
 configure.ac      |    2 +-
 2 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/cmake/Makefile.am b/cmake/Makefile.am
index 737946c..d4f43b8 100644
--- a/cmake/Makefile.am
+++ b/cmake/Makefile.am
@@ -3,6 +3,17 @@ EXTRA_DIST = \
        GtkDocConfigVersion.cmake.in     \
        GtkDocScanGObjWrapper.cmake
 
+CLEANFILES = \
+  GtkDocConfig.cmake \
+  GtkDocConfigVersion.cmake
+
+# Generate this here rather than via configure.ac so that
+# bindir is substituted as an expanded path rather than
+# using ${exec_prefix} as it would if substituted via
+# configure.ac.
+GtkDocConfig.cmake: GtkDocConfig.cmake.in
+       $(SED) -e 's|[@]bindir@|$(bindir)|g' < "$<" > "$@"
+
 cmakedir = $(libdir)/cmake/GtkDoc
 cmake_DATA = \
        GtkDocConfig.cmake \
diff --git a/configure.ac b/configure.ac
index 83488f9..a579a35 100644
--- a/configure.ac
+++ b/configure.ac
@@ -210,10 +210,10 @@ if test "x$have_yelp_tools" != "xyes"; then
 fi
 AM_CONDITIONAL([HAVE_YELP_TOOLS],[test x$have_yelp_tools = xyes])
 
+# cmake/GtkDocConfig.cmake is handled in the Makefile, not here.
 AC_CONFIG_FILES([Makefile
 gtk-doc.pc
 cmake/Makefile
-cmake/GtkDocConfig.cmake
 cmake/GtkDocConfigVersion.cmake
 gtkdoc/config.py
 help/Makefile


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