More changes in doc/Makefile.am

--Boundary-00=_9K4EPIDU/S3sEWg
Content-Type: Text/Plain;
  charset="utf-8"
Content-Transfer-Encoding: 7bit

Attached is a patch I'd like to commit:
- Fix the html/install removal for "make clean"
- Fix test of "userguide" when making links
- Make must fail when openjade fails. Testing doc/book1.htm is not enough, for example when you have partial docbook installation.

--Boundary-00=_9K4EPIDU/S3sEWg
Content-Type: text/x-patch;
  charset="utf-8";
  name="documentation"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline;
	filename="documentation"

diff --git a/doc/Makefile.am b/doc/Makefile.am
index f48bda5..85a1df5 100644
=2D-- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -9,7 +9,7 @@ dist_man_MANS	=3D mdb-tables.1 mdb-ver.1 mdb-export.1 mdb-s=
chema.1 mdb-sql.1 \
 if ENABLE_DOCBOOK
   dist_man_MANS +=3D install.tgz
 endif
=2DDISTCLEANFILES =3D ${dist_man_MANS}
+CLEANFILES =3D ${dist_man_MANS} install install.tgz
 EXTRA_DIST	=3D mdb-tables.txt mdb-ver.txt mdb-export.txt mdb-schema.txt md=
b-sql.txt \
 	mdb-array.txt mdb-header.txt mdb-hexdump.txt mdb-parsecsv.txt mdb-prop.tx=
t gmdb2.txt \
 	faq.html install.sgml
@@ -20,18 +20,14 @@ EXTRA_DIST	=3D mdb-tables.txt mdb-ver.txt mdb-export.tx=
t mdb-schema.txt mdb-sql.tx
 # Converting DocBook to HTML (several small files)
 # http://www.freebsd.org/tutorials/docproj-primer/x3132.html#AEN3140
 install.tgz: $(srcdir)/install.sgml
=2D	rm -rf html && \
=2D	mkdir html && \
+	rm -rf html
+	mkdir html
 	cd html && \
=2D	openjade -d ${DOCBOOK_DSL} -t sgml ../$(srcdir)/install.sgml; \
=2D	test -f book1.htm && \
=2D	ln -s book1.htm index.html && \
=2D	cd .. && \
=2D	if ! [ -L userguide ]; then \
=2D	        ln -s html install; \
=2D	fi ; \
+	    openjade -d ${DOCBOOK_DSL} -t sgml ../install.sgml
+	[ -f html/book1.htm ]
+	ln -s book1.htm html/index.html
+	[ -L install ] || ln -s html install
 	tar zcf install.tgz install/*
=20
 clean-local:
 	-rm -rf html
=2D	-rm -f install

--Boundary-00=_9K4EPIDU/S3sEWg
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

------------------------------------------------------------------------------
RSA(R) Conference 2012
Mar 27 - Feb 2
Save $400 by Jan. 27
Register now!
http://p.sf.net/sfu/rsa-sfdev2dev2
--Boundary-00=_9K4EPIDU/S3sEWg
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
mdbtools-dev mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mdbtools-dev

--Boundary-00=_9K4EPIDU/S3sEWg--