From 4f962f78357a11e545510d48227f41af24bfaab7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?= =?utf8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= Date: Wed, 22 Aug 2012 14:42:25 +0400 Subject: [PATCH] Use GTKDOC_REBASE instead of hard-coding GTKDOC_REBASE will be set to /bin/true if gtkdoc-rebase is missing. Remove unused GTK_DOC_USE_REBASE conditional. Fixes #681635 --- gtk-doc-plugins.mak | 3 +-- gtk-doc.mak | 3 +-- m4/gtk-doc.m4 | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/gtk-doc-plugins.mak b/gtk-doc-plugins.mak index f7c05ed..2468cb0 100644 --- a/gtk-doc-plugins.mak +++ b/gtk-doc-plugins.mak @@ -294,8 +294,7 @@ install-data-local: $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE).devhelp2 \ $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_API_VERSION@.devhelp2; \ fi; \ - (which gtkdoc-rebase >/dev/null && \ - gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR)) || true ; \ + $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) || true ; \ fi) uninstall-local: if test -d $(DESTDIR)$(TARGET_DIR); then \ diff --git a/gtk-doc.mak b/gtk-doc.mak index 31b56f9..a1e07dc 100644 --- a/gtk-doc.mak +++ b/gtk-doc.mak @@ -194,8 +194,7 @@ install-data-local: $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE).devhelp2 \ $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_API_VERSION@.devhelp2; \ fi; \ - (which gtkdoc-rebase >/dev/null && \ - gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR)) || true ; \ + $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) || true ; \ fi) uninstall-local: if test -d $(DESTDIR)$(TARGET_DIR); then \ diff --git a/m4/gtk-doc.m4 b/m4/gtk-doc.m4 index 0c1a305..b243f1c 100644 --- a/m4/gtk-doc.m4 +++ b/m4/gtk-doc.m4 @@ -67,5 +67,4 @@ AC_DEFUN([GTK_DOC_CHECK], AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) - AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) ]) -- 2.7.4