[nautilus-actions] Fix a warning when overriding GTKDOC_RUN
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions] Fix a warning when overriding GTKDOC_RUN
- Date: Thu, 23 Sep 2010 21:41:33 +0000 (UTC)
commit a660ba8c30acf2a30d01ad08bdd6dcf7ca44bce0
Author: Pierre Wieser <pwieser trychlos org>
Date: Thu Sep 23 17:49:57 2010 +0200
Fix a warning when overriding GTKDOC_RUN
It is necessary to prefix the GTKDOC_RUN command with a LD_LIBARY_PATH
which points to the core library just built.
ChangeLog | 2 ++
doc/api/Makefile.am | 9 +++++----
2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 4cc3092..a1606bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2010-09-23 Pierre Wieser <pwieser trychlos org>
+ * doc/api/Makefile.am: Fix the warning when overriding GTKDOC_RUN.
+
* m4/na-enable-manuals.m4:
* run-autogen.sh:
Update --enable-html-manuals and --enable-pdf-manuals options.
diff --git a/doc/api/Makefile.am b/doc/api/Makefile.am
index 872e968..9c25b01 100644
--- a/doc/api/Makefile.am
+++ b/doc/api/Makefile.am
@@ -100,14 +100,15 @@ AM_LDFLAGS = \
# Need this to be able to set ourselves GTKDOC_RUN
# This is extracted from gtk-doc.make
if GTK_DOC_USE_LIBTOOL
-orig_gtkdoc_run = $(LIBTOOL) --mode=execute
+override GTKDOC_RUN = \
+ $(gtkdoc_run_prefix) $(LIBTOOL) --mode=execute
else
-orig_gtkdoc_run = sh -c
+override GTKDOC_RUN = \
+ $(gtkdoc_run_prefix) sh -c
endif
-GTKDOC_RUN = \
+gtkdoc_run_prefix = \
LD_LIBRARY_PATH=$(core_libdir) \
- $(orig_gtkdoc_run) \
$(NULL)
# Extra options to supply to gtkdoc-mkdb
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]