Build the docbook version, not the old linuxdoc version.

Tue Mar  5 16:53:05 2002  Owen Taylor  <otaylor@redhat.com>

        * docs/faq/Makefile.am: Build the docbook version, not
        the old linuxdoc version.

8 files changed, 56 insertions, 35 deletions

diff --git a/ChangeLog b/ChangeLog
index f42114cd6..8df720bdd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar  5 16:53:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* docs/faq/Makefile.am: Build the docbook version, not
+	the old linuxdoc version.
+
 Tue Mar  5 15:47:54 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in test/makefile.msc **.pc.in **/*.am:
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index f42114cd6..8df720bdd 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Tue Mar  5 16:53:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* docs/faq/Makefile.am: Build the docbook version, not
+	the old linuxdoc version.
+
 Tue Mar  5 15:47:54 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in test/makefile.msc **.pc.in **/*.am:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f42114cd6..8df720bdd 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Tue Mar  5 16:53:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* docs/faq/Makefile.am: Build the docbook version, not
+	the old linuxdoc version.
+
 Tue Mar  5 15:47:54 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in test/makefile.msc **.pc.in **/*.am:
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index f42114cd6..8df720bdd 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Tue Mar  5 16:53:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* docs/faq/Makefile.am: Build the docbook version, not
+	the old linuxdoc version.
+
 Tue Mar  5 15:47:54 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in test/makefile.msc **.pc.in **/*.am:
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f42114cd6..8df720bdd 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Tue Mar  5 16:53:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* docs/faq/Makefile.am: Build the docbook version, not
+	the old linuxdoc version.
+
 Tue Mar  5 15:47:54 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in test/makefile.msc **.pc.in **/*.am:
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f42114cd6..8df720bdd 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Tue Mar  5 16:53:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* docs/faq/Makefile.am: Build the docbook version, not
+	the old linuxdoc version.
+
 Tue Mar  5 15:47:54 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in test/makefile.msc **.pc.in **/*.am:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f42114cd6..8df720bdd 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Tue Mar  5 16:53:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* docs/faq/Makefile.am: Build the docbook version, not
+	the old linuxdoc version.
+
 Tue Mar  5 15:47:54 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in test/makefile.msc **.pc.in **/*.am:
diff --git a/docs/faq/Makefile.am b/docs/faq/Makefile.am
index bf5868775..dcf698d48 100644
--- a/docs/faq/Makefile.am
+++ b/docs/faq/Makefile.am
@@ -1,44 +1,30 @@
-.PHONY: htmldir textdir faq
+if HAVE_DOCBOOK
+html: 
+	(cd $(srcdir); \
+	 db2html gtk-faq.sgml; \
+	 mv gtk-faq html)
 
-FAQ_FILES=html/gtkfaq.html		\
-	html/gtkfaq-1.html       	\
-	html/gtkfaq-2.html       	\
-	html/gtkfaq-3.html       	\
-	html/gtkfaq-4.html       	\
-	html/gtkfaq-5.html       	\
-	html/gtkfaq-6.html       	\
-	html/gtkfaq-7.html		\
-	html/gtkfaq-8.html		\
-	html/gtkfaq-9.html		\
-	text/gtkfaq.txt
+pdf:
+	(cd $(srcdir); db2pdf gtk-faq.sgml)
 
-$(FAQ_FILES): faq
-
-htmldir:
-	mkdir -p $(srcdir)/html
-
-textdir:
-	mkdir -p $(srcdir)/text
-
-faq: htmldir textdir
-	(cd $(srcdir); sgml2html gtkfaq.sgml;            \
-	perl $(top_srcdir)/docs/gtkdocs_fix gtkfaq*html; \
-	mv gtkfaq*html html/;                            \
-	sgml2txt gtkfaq.sgml;                            \
-	mv gtkfaq.txt text/)
+dist-hook: html
+	cp -Rp $(srcdir)/html $(distdir)
+else
+html:
+	echo "***"
+	echo "*** Warning: FAQ not built"
+	echo "***"
 
-EXTRA_DIST = gtkfaq.sgml gtk-faq.sgml
+pdf:
+	echo "***"
+	echo "*** Warning: FAQ not built"
+	echo "***"
 
-if HAVE_SGML2HTML
-dist-hook: faq
-	mkdir $(distdir)/html
-	cp -p $(srcdir)/html/*.html $(distdir)/html
-	mkdir $(distdir)/text
-	cp -p $(srcdir)/text/*.txt $(distdir)/text
-else
 dist-hook:
 	echo "***"
-	echo "*** Warning: FAQ not built"
+	echo "*** Warning: Tutorial not built"
 	echo "*** DISTRIBUTION IS INCOMPLETE"
 	echo "***"
 endif
+
+.PHONY: html