[farsight2/master] Fix plugins doc Makefiles to let distcheck pass

[Olivier Crête]

---
 common/gtk-doc-plugins.mak |    6 ++----
 docs/plugins/Makefile.am   |    2 ++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/gtk-doc-plugins.mak b/common/gtk-doc-plugins.mak
index 3a3edc2..7bc49cf 100644
--- a/common/gtk-doc-plugins.mak
+++ b/common/gtk-doc-plugins.mak
@@ -80,7 +80,7 @@ REPORT_FILES = \
 
 # FC3 seems to need -scan.c to be part of CLEANFILES for distcheck
 # no idea why FC4 can do without
-CLEANFILES = \
+CLEANFILES += \
 	$(SCANOBJ_FILES_O) \
 	$(DOC_MODULE)-scan.c \
 	$(REPORT_FILES) \
@@ -299,8 +299,6 @@ install-data-local:
 	    $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp2 \
 	           $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)- at GST_MAJORMINOR@.devhelp2; \
 	  fi; \
-	  (which gtkdoc-rebase >/dev/null && \
-	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR)) || true ; \
 	fi) 
 uninstall-local:
 	(installfiles=`echo ./html/*.html`; \
@@ -403,8 +401,8 @@ dist-hook: dist-check-gtkdoc dist-hook-local
 	cp $(srcdir)/html/* $(distdir)/html
 	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
 	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+	-cp $(srcdir)/html/$(DOC_MODULE).devhelp* $(distdir)/html
 	cd $(distdir) && rm -f $(DISTCLEANFILES)
-        -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
 
 .PHONY : dist-hook-local docs
 
diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index 9812254..ceb9184 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -114,6 +114,8 @@ farsight2-transmitters.types: farsight2-transmitters.types.in Makefile
 		echo "${i}" >> $@ ;\
 	done
 
+CLEANFILES = farsight2-transmitters.types
+
 # CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib
 # contains GtkObjects/GObjects and you want to document signals and properties.
 GTKDOC_CFLAGS = $(GST_BASE_CFLAGS) -I$(top_builddir) -I$(top_builddir)/gst-libs
-- 
1.5.6.5