- remove PDF generation as it doesn't work currently;

- adapt Makefiles to only create man pages for "make dist"
- break long lines
- ignore return values of rm commands
- manual.docbook renamed to manual.docbook.in; this was necessary
  to avoid using phony targets in man page creation


git-svn-id: https://svn.ibp.de/svn/capisuite/trunk/capisuite@308 4ebea2bb-67d4-0310-8558-a5799e421b66

ChangeLog

@@ -1,3 +1,11 @@
+2004-05-18  Gernot Hillier  <gernot@hillier.de>
+	* docs/Makefile.am: remove PDF generation as it doesn't work currently;
+	  adapt Makefiles to only create man pages for "make dist"; break long 
+	  lines; ignore return values of rm commands
+	* docs/manual.docbook: renamed to manual.docbook.in; this was necessary
+	  to avoid using phony targets in man page creation
+	* docs/manual.docbook.in: see above.
+
 2004-04-18  Gernot Hillier  <gernot@hillier.de>
 	* scripts/capisuitefax.in: allow * and # in destination numbers
 

docs/Makefile.am

@@ -6,20 +6,24 @@ man_MANS = capisuite.8 capisuite.conf.5 fax.conf.5 answering_machine.conf.5 capi
 # dist-hook may be not portable partly, so non-SuSE-users please
 # forgive me and don't call "make dist" or send me a patch ;-)
 
-dist-hook: manual-html manual-pdf manual-manpages reference-html
+# removed manual-pdf as it currently doesn't work, will be reactivated soon
+dist-hook: cleandoc manual-html reference-html capisuite.8 capisuite.conf.5 fax.conf.5 answering_machine.conf.5 capisuitefax.1
 	mkdir $(distdir)/manual
 	cp -r $(srcdir)/manual/* $(distdir)/manual/
 	mkdir $(distdir)/reference
 	cp $(srcdir)/reference/* $(distdir)/reference/
 	cp manual.pdf $(distdir)/
 
-manual-prepare:
+# force recreation of complete manual for dist
+cleandoc:
+	-rm manual.docbook
+
+manual.docbook: manual.docbook.in
 	sed -e 's,<title>CapiSuite [0-9a-z\.]*</title>,<title>CapiSuite $(VERSION)</title>,g' \
-	  manual.docbook > manual.new # (not another *.in file...)
-	mv manual.new manual.docbook
+	  manual.docbook.in > manual.docbook
 	xmllint --noout --valid manual.docbook
 
-manual-html: manual-prepare
+manual-html: manual.docbook
 	xsltproc --stringparam profile.condition html -o manual-profiled.docbook \
 	  /usr/share/xml/docbook/stylesheet/nwalsh/current/profiling/profile.xsl \
 	   manual.docbook
@@ -34,13 +38,18 @@ manual-html: manual-prepare
 		exit 1; \
 	fi
 
-manual-manpages: manual-prepare
-	xsltproc --stringparam profile.condition man -o manual-profiled.docbook /usr/share/xml/docbook/stylesheet/nwalsh/current/profiling/profile.xsl manual.docbook
-	xsltproc /usr/share/xml/docbook/stylesheet/nwalsh/current/manpages/docbook.xsl manual-profiled.docbook
+capisuite.8 capisuite.conf.5 fax.conf.5 answering_machine.conf.5 capisuitefax.1: manual.docbook
+	xsltproc --stringparam profile.condition man -o manual-profiled.docbook \
+	  /usr/share/xml/docbook/stylesheet/nwalsh/current/profiling/profile.xsl \
+	  manual.docbook
+	xsltproc /usr/share/xml/docbook/stylesheet/nwalsh/current/manpages/docbook.xsl \
+	  manual-profiled.docbook
 	rm manual-profiled.docbook
 
-manual-pdf: manual-prepare
-	xsltproc --stringparam profile.condition pdf -o manual.xml /usr/share/xml/docbook/stylesheet/nwalsh/current/profiling/profile.xsl manual.docbook
+manual-pdf: manual.docbook
+	xsltproc --stringparam profile.condition pdf -o manual.xml \
+	  /usr/share/xml/docbook/stylesheet/nwalsh/current/profiling/profile.xsl \
+	  manual.docbook
 	db2pdf manual.xml 
 	-rm CATALOG.local manual.aux manual.log manual.out manual.tex suse-*.dsl manual.xml
 
@@ -72,8 +81,8 @@ install-data-local:
 	fi
 
 uninstall-local:
-	rm -rf $(DESTDIR)$(docdir) 
+	-rm -rf $(DESTDIR)$(docdir) 
 
 maintainer-clean-local:
-	rm -rf reference manual manual.pdf *.[1-9]
- 
+	-rm -rf reference manual manual.pdf *.[1-9]
+