diff options
| author | Edward Hervey <edward.hervey@collabora.co.uk> | 2011-01-07 15:55:27 +0100 |
|---|---|---|
| committer | Edward Hervey <edward.hervey@collabora.co.uk> | 2011-01-07 15:55:27 +0100 |
| commit | 628a0ffb15f82b8ab2ae673134cb52c24c88369f (patch) | |
| tree | e5c20ea9e7f2d27e8e2ad8860ed3d029d10de26a | |
| parent | 46445ad50f184d2640dd205361e0446e9121ba5f (diff) | |
gstdoc-scangobj: Don't use hardcoded perl and gtk-doc prefixperl
Modules need to make sure they add common/gstdoc-scangobj to the
AC_CONFIG_FILES in their configure.ac
Fixes build with perl and gtk-doc installed in non standard locations
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r--[-rwxr-xr-x] | gstdoc-scangobj.in (renamed from gstdoc-scangobj) | 4 | ||||
| -rw-r--r-- | m4/gst-plugin-docs.m4 | 2 |
3 files changed, 5 insertions, 2 deletions
@@ -1,3 +1,4 @@ Makefile Makefile.in +gstdoc-scangobj *~ diff --git a/gstdoc-scangobj b/gstdoc-scangobj.in index ae28779..05c9245 100755..100644 --- a/gstdoc-scangobj +++ b/gstdoc-scangobj.in @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!@PERL_PATH@ -w # -*- cperl -*- # # gtk-doc - GTK DocBook documentation generator. @@ -30,7 +30,7 @@ use Getopt::Long; -unshift @INC, '/usr/share/gtk-doc/data'; +unshift @INC, '@GTK_DOC_PREFIX@/share/gtk-doc/data'; require "gtkdoc-common.pl"; # Options diff --git a/m4/gst-plugin-docs.m4 b/m4/gst-plugin-docs.m4 index dcfd61d..65b3845 100644 --- a/m4/gst-plugin-docs.m4 +++ b/m4/gst-plugin-docs.m4 @@ -12,6 +12,8 @@ AC_DEFUN([AG_GST_PLUGIN_DOCS], AC_MSG_CHECKING([whether to build plugin documentation]) if test x$enable_gtk_doc = xyes; then build_plugin_docs=yes + GTK_DOC_PREFIX="`$PKG_CONFIG --variable=prefix gtk-doc`" + AC_SUBST(GTK_DOC_PREFIX) AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no (gtk-doc disabled or not available)]) |