as Siggi and I agreed on: it is a bad idea to include pre-built versions

of the SGML and FIG files in the cvs, not only does it provoke inconsistencies,
it also breaks the current automatic update on xinehq.de, so:
* remove any pre-built files from CVS
* modify the Makefile's so that a "make dist" always rebuilds those files;
  that way, it is ensured that up-to-date pre-built versions are included
  in the release tarball so users don't need to install the whole docbook
  toolchain just to read the FAQ in HTML

CVS patchset: 5599
CVS date: 2003/10/26 10:44:39

1 files changed, 13 insertions, 1 deletions

diff --git a/doc/faq/Makefile.am b/doc/faq/Makefile.am
index ba3ebd15c..1e6fe0142 100644
--- a/doc/faq/Makefile.am
+++ b/doc/faq/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/misc/Makefile.common
 
-EXTRA_DIST = $(docs_DOCS) README faq.sgml
+EXTRA_DIST = README faq.sgml
 docs_DOCS = faq.html faq.txt
 
 docdir = $(prefix)/share/doc/xine/faq
@@ -28,12 +28,24 @@ uninstall-local:
 
 docs: $(docs_DOCS)
 
+dist-hook:
+	@make fail_if_missing=yes docs
+	cp $(docs_DOCS) $(distdir)
+
 faq.html: faq.sgml
 	@if test "$(SGMLTOOLS)" != "no"; then \
 	  $(SGMLTOOLS) -b onehtml faq.sgml; \
+	else if test "$(fail_if_missing)" = "yes"; then \
+	    echo "Please install sgmltools-lite."; \
+	    exit 1; \
+	  fi; \
 	fi
 
 faq.txt: faq.sgml
 	@if test "$(SGMLTOOLS)" != "no"; then \
 	  $(SGMLTOOLS) -b txt faq.sgml; \
+	else if test "$(fail_if_missing)" = "yes"; then \
+	    echo "Please install sgmltools-lite."; \
+	    exit 1; \
+	  fi; \
 	fi