Tested on darwin21 with "make m2.pdf" and "make m2.dvi".
OK for trunk?
thanks.
Iain

--- 8< ---

This also uses the configured $(TEXI2DVI) and $(TEXI2PDF) to deal with those
targets (since we cannot assume to know what the user might have installed).

gcc/m2/ChangeLog:

        * Make-lang.in (dvi, ps, pdf): Build in the gcc/doc directory, also
        use the configured tools for texi -> dvi and texi -> pdf.
---
 gcc/m2/Make-lang.in | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/gcc/m2/Make-lang.in b/gcc/m2/Make-lang.in
index a134d3aca92..6c2b095bb7d 100644
--- a/gcc/m2/Make-lang.in
+++ b/gcc/m2/Make-lang.in
@@ -140,18 +140,22 @@ $(DESTDIR)$(man1dir)/$(GM2_INSTALL_NAME)$(man1ext): 
doc/m2.1 installdirs
        -$(INSTALL_DATA) $< $@
        -chmod a-x $@
 
-m2.dvi: $(TEXISRC)
+m2.dvi: doc/m2.dvi
+
+doc/m2.dvi: $(TEXISRC)
        $(TEXI2DVI) -I $(objdir)/m2 -I $(srcdir)/doc/include 
$(srcdir)/doc/gm2.texi -o $@
 
-m2.ps: m2.dvi
+doc/m2.ps: doc/m2.dvi
        dvips -o $@ $<
 
-m2.pdf: m2.ps
-       gs -q -dBATCH -dNOPAUSE -sDEVICE=pdfwrite -sOutputFile=$@ $<
+m2.pdf: doc/m2.pdf
+
+doc/m2.pdf: $(TEXISRC)
+       $(TEXI2PDF) -I $(objdir)/m2 -I $(srcdir)/doc/include 
$(srcdir)/doc/gm2.texi -o $@
 
 .INTERMEDIATE: m2.pod
 
-m2.pod: doc/gm2.texi $(TEXISRC)
+m2.pod: $(TEXISRC)
        -$(TEXI2POD) -I $(objdir)/m2 -D m2 < $< > $@
 
 doc/m2.info: $(TEXISRC)
-- 
2.37.1 (Apple Git-137.1)

Reply via email to