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

diff --git a/gtk-doc-plugins.mak b/gtk-doc-plugins.mak
index f7c05ed..2468cb0 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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"])
 ])