diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-09-14 10:36:23 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-09-14 10:36:23 +0200 |
| commit | a60e713f58609144379f0ad770ac7cb78352a996 (patch) | |
| tree | 24341bcb93eadb134dd0ca234f41facd9f33bf15 /common | |
| parent | c167d67e1cc2c9f9ff50fa06757b1cd246a71383 (diff) | |
Imported Upstream version 0.11.94upstream/0.11.94
Diffstat (limited to 'common')
| -rw-r--r-- | common/gtk-doc-plugins.mak | 3 | ||||
| -rw-r--r-- | common/gtk-doc.mak | 3 | ||||
| -rw-r--r-- | common/m4/gtk-doc.m4 | 1 |
3 files changed, 2 insertions, 5 deletions
diff --git a/common/gtk-doc-plugins.mak b/common/gtk-doc-plugins.mak index f7c05ed..2468cb0 100644 --- a/common/gtk-doc-plugins.mak +++ b/common/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/common/gtk-doc.mak b/common/gtk-doc.mak index 31b56f9..a1e07dc 100644 --- a/common/gtk-doc.mak +++ b/common/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/common/m4/gtk-doc.m4 b/common/m4/gtk-doc.m4 index 0c1a305..b243f1c 100644 --- a/common/m4/gtk-doc.m4 +++ b/common/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"]) ]) |