From 1ff63d8f92c36bf207434436f4ce75f2a4ea11a4 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Sat, 6 Sep 2008 01:10:27 +0000 Subject: [PATCH] gtk-doc-plugins.mak: Fix the check for gtkdoc-rebase: don't pass the 'which' error back to make. This fix is more sp... Original commit message from CVS: * gtk-doc-plugins.mak: Fix the check for gtkdoc-rebase: don't pass the 'which' error back to make. This fix is more specific than what is in upstream. --- ChangeLog | 12 ++++++++++++ gtk-doc-plugins.mak | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2708499..3e8d29b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2008-09-05 David Schleef + + * gtk-doc-plugins.mak: Fix the check for gtkdoc-rebase: don't + pass the 'which' error back to make. This fix is more specific + than what is in upstream. + +2008-09-05 David Schleef + + * gtk-doc.mak: Fix the check for gtkdoc-rebase: don't pass the + 'which' error back to make. This fix is more specific than + what is in upstream. + 2008-09-04 Stefan Kost * gtk-doc-plugins.mak: diff --git a/gtk-doc-plugins.mak b/gtk-doc-plugins.mak index 8993906..f673a7f 100644 --- a/gtk-doc-plugins.mak +++ b/gtk-doc-plugins.mak @@ -298,8 +298,8 @@ install-data-local: $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp2 \ $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; \ fi; \ - which gtkdoc-rebase >/dev/null && \ - gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ + (which gtkdoc-rebase >/dev/null && \ + gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR)) || true ; \ fi) uninstall-local: (installfiles=`echo ./html/*.html`; \ -- 2.7.4