From c26d3813c46a0df955810f4d3dda4dfd7a278e66 Mon Sep 17 00:00:00 2001 From: Damien Lespiau Date: Mon, 31 Dec 2012 23:24:26 +0000 Subject: [PATCH] doc: Fix cross-referencing with glib and gdk-pixbuf The libraries prefixes where never set in the configure script and GDKPIXBUF_PREFIX had a typo. (cherry picked from commit 5d8c0e13ed0572f806fdff2bff1d5904ed3bf69b) --- configure.ac | 5 +++++ doc/reference/cogl-2.0-experimental/Makefile.am | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index c9f546437..c7579cc79 100644 --- a/configure.ac +++ b/configure.ac @@ -1099,6 +1099,11 @@ GTK_DOC_CHECK([gtk_doc_req_version], [--flavour no-tmpl]) ]) AM_CONDITIONAL([BUILD_GTK_DOC], [test "x$enable_gtk_doc" = "xyes"]) +GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`" +GDKPIXBUF_PREFIX="`$PKG_CONFIG --variable=prefix gdk-pixbuf-2.0`" +AC_SUBST(GLIB_PREFIX) +AC_SUBST(GDKPIXBUF_PREFIX) + dnl ================================================================ dnl I18n stuff. dnl ================================================================ diff --git a/doc/reference/cogl-2.0-experimental/Makefile.am b/doc/reference/cogl-2.0-experimental/Makefile.am index 0726b082e..ea36eac86 100644 --- a/doc/reference/cogl-2.0-experimental/Makefile.am +++ b/doc/reference/cogl-2.0-experimental/Makefile.am @@ -39,7 +39,7 @@ MKTMPL_OPTIONS= # e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html FIXXREF_OPTIONS=\ --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \ - --extra-dir=$(GDPIXBUF_PREFIX)/share/gtk-doc/html/gdk-pixbuf + --extra-dir=$(GDKPIXBUF_PREFIX)/share/gtk-doc/html/gdk-pixbuf # Used for dependencies. The docs will be rebuilt if any of these change. # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h