[Gnash-commit] gnash/doc/C Makefile.am

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    08/02/20 01:43:07

Modified files:
        doc/C          : Makefile.am 

Log message:
                * doc/C/Makefile.am: Use newer wrappers for docbook2x tools
                instead of the old two step process.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/Makefile.am?cvsroot=gnash&r1=1.46&r2=1.47

Patches:
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/doc/C/Makefile.am,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- Makefile.am 19 Feb 2008 02:12:48 -0000      1.46
+++ Makefile.am 20 Feb 2008 01:43:07 -0000      1.47
@@ -117,7 +117,7 @@
 
 html: links gnash.html actionscript.html
 pdf:  links gnash.pdf actionscript.pdf
-man:  gnash.1 gprocessor.1 dumpshm.1 soldumper.1
+man:  $(dist_man_MANS)
 texi: gnash.texi actionscript.texi
 info: links gnash.info actionscript.info
 gnash.pdf gnash.html gnash.texi: links $(xml_files) $(entities)
@@ -156,7 +156,7 @@
 .xml.html:
 if ENABLE_HTML
        $(XSLTPROC) --output $@ --nonet $(docbook_styles)/html/docbook.xsl $<
-       $(RM) $*.txml
+       @$(RM) $*.txml
 else
        @if test -d $(top_srcdir)/packaging/doc; then \
          $(LN_S) -f $(top_srcdir)/packaging/doc/address@hidden ./$@; \
@@ -168,13 +168,17 @@
 #      basefile=$(notdir $(basename $<));
 .xml.texi:
 if ENABLE_TEXI
-       basefile=`echo $< | sed -e  's,^.*/,,' -e 's,\.xml$$,,'`; \
+       -if test x$(DB2X_TEXI) != x; then \
+         $(DB2X_TEXI) --encoding=us-ascii//TRANSLIT $< ; \
+       else \
+         basefile="$*"; \
        $(DB2X_XSLTPROC) -s texi $< --output $${basefile}.txml; \
        if test x"$(DB2X_VERSION)" = x"0.8.5" -o x"$(DB2X_VERSION)" = x"0.8.7"; 
then \
          $(DB2X_TEXIXML) --encoding=us-ascii//TRANSLIT $${basefile}.txml; \
          sed -e "s/setfilename $${basefile}_.*\.info/setfilename 
$${basefile}.info/" $${basefile}_*.texi > $${basefile}.texi ; \
        else \
          $(DB2X_TEXIXML) --encoding=us-ascii//TRANSLIT --to-stdout 
$${basefile}.txml > $${basefile}.texi ; \
+         fi; \
        fi
 endif
 
@@ -192,10 +196,13 @@
 
 .man-xml.1:
 if ENABLE_MAN
-       echo "\"$?\", \"$*\", \"$<\""
-       $(DB2X_XSLTPROC) -s man $? -o $*.mxml
-       $(DB2X_MANXML) $*.mxml
-       $(RM) $*.mxml
+       address@hidden test x$(DB2X_MAN) != x; then \
+         $(DB2X_MAN) $?; \
+        else \
+         $(DB2X_XSLTPROC) -s man $? -o $*.mxml; \
+         $(DB2X_MANXML) $*.mxml; \
+         $(RM) $*.mxml; \
+       fi
 else
        @if test -d $(top_srcdir)/packaging/doc; then \
          $(LN_S) -f $(top_srcdir)/packaging/doc/address@hidden ./$@; \