[Cvs-cvs] Changes to ccvs/doc/Makefile.in [cvs1-11-x-branch]

[Derek Robert Price]

Index: ccvs/doc/Makefile.in
diff -u ccvs/doc/Makefile.in:1.55.4.21 ccvs/doc/Makefile.in:1.55.4.22
--- ccvs/doc/Makefile.in:1.55.4.21      Mon Sep 26 16:17:25 2005
+++ ccvs/doc/Makefile.in        Tue Sep 27 13:19:33 2005
@@ -180,7 +180,7 @@
 
 PDFS = \
        cvs.pdf \
-       cvs-paper.pdf \
+       $(srcdir)/cvs-paper.pdf \
        cvsclient.pdf
 
 TXTS = \
@@ -198,6 +198,7 @@
        cvs.man.footer \
        $(PDFS)
 
+MOSTLYCLEANFILES = cvs-paper.pdf-t cvs-paper.ps-t
 CLEANFILES = \
        $(PSS) \
        $(TXTS)
@@ -544,6 +545,7 @@
          `test -z '$(STRIP)' || \
            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
+       -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
        -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
@@ -664,16 +666,27 @@
 cvs.txt: cvs.texinfo $(srcdir)/version.texi
 cvsclient.txt: cvsclient.texi $(srcdir)/version-client.texi
 
-# These targets need to be very specific so that the other PDFs get generated
-# correctly.  If they are more generic and cvs.ps is made before cvs.pdf, then
-# cvs.pdf will be generated from the generic target and the PS source, which
-# contains less information (hyperlinks and such) than the usual texinfo 
source.
+# The cvs-paper.pdf target needs to be very specific so that the other PDFs get
+# generated correctly.  If a more generic .ps.pdf implicit target is defined,
+# and cvs.ps is made before cvs.pdf, then cvs.pdf can be generated from the
+# .ps.pdf target and the PS source, which contains less information (hyperlinks
+# and such) than the usual texinfo source.
+#
+# It is possible that an implicit .ms.ps target could be safely defined.  I
+# don't recall looking into it.
 cvs-paper.ps: cvs-paper.ms
-       $(ROFF) -t -p -ms -Tps $< > address@hidden
-       mv address@hidden $@
-
-cvs-paper.pdf: cvs-paper.ps
-       ps2pdf $< $@
+       $(ROFF) -t -p -ms -Tps $(srcdir)/cvs-paper.ms >cvs-paper.ps-t
+       cp cvs-paper.ps-t $@
+       address@hidden -f cvs-paper.ps-t
+
+# This rule introduces some redundancy, but `make distcheck' requires that
+# Nothing in $(srcdir) be rebuilt, and this will always be rebuilt when it
+# is dependant on cvs-paper.ps and cvs-paper.ps isn't distributed.
+$(srcdir)/cvs-paper.pdf: cvs-paper.ms
+       $(ROFF) -t -p -ms -Tps $(srcdir)/cvs-paper.ms >cvs-paper.ps-t
+       ps2pdf cvs-paper.ps-t cvs-paper.pdf-t
+       cp cvs-paper.pdf-t $@
+       address@hidden -f cvs-paper.pdf-t cvs-paper.ps-t
 
 # Targets to build a man page from cvs.texinfo.
 $(srcdir)/cvs.1: @MAINTAINER_MODE_TRUE@ mkman cvs.man.header cvs.texinfo 
cvs.man.footer