fix docs build fix make distcheck
Original commit message from CVS:
fix docs build
fix make distcheck
diff --git a/ChangeLog b/ChangeLog
index d27e8a6..78a588f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-02 Thomas Vander Stichele <thomas at apestaart dot org>
+
+ * fix documentation build using docbook2..., works on fc1 and rh9
+ * fix distcheck on fc1
+
2003-11-14 Thomas Vander Stichele <thomas at apestaart dot org>
* put GST_CACHE_DIR in config.h, as ordered by iain
diff --git a/configure.ac b/configure.ac
index a2d0729..6ef8af9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -616,10 +616,8 @@
testsuite/tags/Makefile
testsuite/threads/Makefile
examples/Makefile
-examples/autoplug/Makefile
examples/cutter/Makefile
examples/helloworld/Makefile
-examples/helloworld2/Makefile
examples/launch/Makefile
examples/manual/Makefile
examples/mixer/Makefile
diff --git a/docs/faq/faq.xml b/docs/faq/faq.xml
index 23bae58..35dcb28 100644
--- a/docs/faq/faq.xml
+++ b/docs/faq/faq.xml
@@ -20,7 +20,7 @@
]>
-<article class="faq">
+<article class="faq" id="index">
<articleinfo>
<title>GStreamer FAQ</title>
<abstract>
diff --git a/docs/htmlinstall.mak b/docs/htmlinstall.mak
index 0d2d6ec..6ceff19 100644
--- a/docs/htmlinstall.mak
+++ b/docs/htmlinstall.mak
@@ -4,12 +4,12 @@
if DOC_HTML
install-data-local: html
- mkdir -p $(docdir)
- cp -pr $(HTML_DAT) $(docdir)
+ $(mkinstalldirs) $(DESTDIR)$(docdir)
+ cp -pr $(HTML_DAT) $(DESTDIR)$(docdir)
uninstall-local:
- for part in $(HTML_DAT); do rm -rf $(docdir)/$$part; done
- rmdir $(docdir)
+ for part in $(HTML_DAT); do rm -rf $(DESTDIR)$(docdir)/$$part; done
+ rmdir $(DESTDIR)$(docdir)
else
install-data-local:
uninstall-local:
diff --git a/docs/manuals.mak b/docs/manuals.mak
index 9c5e98b..51f5ec7 100644
--- a/docs/manuals.mak
+++ b/docs/manuals.mak
@@ -95,7 +95,7 @@
@echo "*** Generating HTML output ***"
@-mkdir -p html
@cp -f $(srcdir)/../image-png $(BUILDDIR)/image.entities
- @cd $(BUILDDIR) && docbook2html -o ../html $(MAIN)
+ @cd $(BUILDDIR) && docbook2html -o ../html -V '%use-id-as-filename%' $(MAIN)
@test "x$(CSS)" != "x" && \
echo "Copying .css files: $(CSS)" && \
cp $(srcdir)/$(CSS) html
diff --git a/docs/pwg/pwg.xml b/docs/pwg/pwg.xml
index c60f1d8..be67573 100644
--- a/docs/pwg/pwg.xml
+++ b/docs/pwg/pwg.xml
@@ -38,7 +38,7 @@
<!ENTITY GstLibRef "<emphasis>GStreamer Library Reference</emphasis>">
]>
-<book id="book-gst-plugin-writers-guide">
+<book id="index">
&TITLEPAGE;
<!-- ############# part ############### -->
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 1dfba1b..ed48293 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -6,7 +6,6 @@
dirs = \
helloworld \
- helloworld2 \
queue \
queue2 \
queue3 \
diff --git a/gst/autoplug/Makefile.am b/gst/autoplug/Makefile.am
index 5d65e44..118ef8c 100644
--- a/gst/autoplug/Makefile.am
+++ b/gst/autoplug/Makefile.am
@@ -10,7 +10,7 @@
libgstspider_la_LIBADD =
libgstspider_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-noinst_HEADERS = gstspider.h gstsearchfuncs.h
+noinst_HEADERS = gstspider.h gstspideridentity.h gstsearchfuncs.h
noinst_PROGRAMS = spidertest
diff --git a/tests/old/examples/Makefile.am b/tests/old/examples/Makefile.am
index 1dfba1b..ed48293 100644
--- a/tests/old/examples/Makefile.am
+++ b/tests/old/examples/Makefile.am
@@ -6,7 +6,6 @@
dirs = \
helloworld \
- helloworld2 \
queue \
queue2 \
queue3 \
