[Python-checkins] CVS: python/dist/src/Doc Makefile,1.204,1.205

[Fred L. Drake]

Update of /cvsroot/python/python/dist/src/Doc
In directory usw-pr-cvs1:/tmp/cvs-serv9355

Modified Files:
	Makefile 
Log Message:

Change the main targets to generate HTML instead of PostScript.

Update the comments at the beginning of the file.


Index: Makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/Makefile,v
retrieving revision 1.204
retrieving revision 1.205
diff -C2 -r1.204 -r1.205
*** Makefile	2000/10/19 13:25:15	1.204
--- Makefile	2001/01/22 20:47:26	1.205
***************
*** 15,24 ****
  #   dist -- Distributing Python Modules
  #
! # The latex sources for each of these documents are in subdirectories
  # with the three-letter designations above as the directory names.
  #
! # The main target creates DVI and PostScript for the main each of the
! # documents.  You can also do "make lib" (etc.) to create the DVI and
! # PostScript versions of individual documents.
  #
  # The document classes and styles are in the texinputs/ directory.
--- 15,24 ----
  #   dist -- Distributing Python Modules
  #
! # The LaTeX sources for each of these documents are in subdirectories
  # with the three-letter designations above as the directory names.
  #
! # The main target creates HTML for each of the documents.  You can
! # also do "make lib" (etc.) to create the HTML versions of individual
! # documents.
  #
  # The document classes and styles are in the texinputs/ directory.
***************
*** 26,29 ****
--- 26,32 ----
  # as macros in Texinfo (e.g. \code{...} and \emph{...}), as well as a
  # number of environments for formatting function and data definitions.
+ # Documentation for the macros is included in "Documenting Python"; see
+ # http://www.python.org/doc/current/doc/doc.html, or the sources for
+ # this document in the doc/ directory.
  #
  # Everything is processed by LaTeX.  See the file `README' for more
***************
*** 38,43 ****
  # the tools used are all but universal.  These targets are:
  #
! #   html -- convert all documents from LaTeX to HTML
! #   pdf  -- convert all documents from LaTeX to the
  #		Portable Document Format
  #
--- 41,46 ----
  # the tools used are all but universal.  These targets are:
  #
! #   ps  -- convert all documents from LaTeX to PostScript
! #   pdf -- convert all documents from LaTeX to the
  #		Portable Document Format
  #
***************
*** 52,58 ****
  # dependency information, see Makefile.deps.
  
! # Customizations -- you *may* have to edit these
  
! # you could set this to a4
  PAPER=letter
  
--- 55,61 ----
  # dependency information, see Makefile.deps.
  
! # Customization -- you *may* have to edit this
  
! # You could set this to a4:
  PAPER=letter
  
***************
*** 75,79 ****
  
  # Main target
! all:	ps
  
  dvi:
--- 78,82 ----
  
  # Main target
! all:	html
  
  dvi:
***************
*** 90,118 ****
  
  # Targets for each document:
! api api.ps:
  	(cd paper-$(PAPER); $(MAKE) api.ps)
  
! doc doc.ps:
  	(cd paper-$(PAPER); $(MAKE) doc.ps)
  
! ext ext.ps:
  	(cd paper-$(PAPER); $(MAKE) ext.ps)
  
! lib lib.ps:
  	(cd paper-$(PAPER); $(MAKE) lib.ps)
  
! mac mac.ps:
  	(cd paper-$(PAPER); $(MAKE) mac.ps)
  
! ref ref.ps:
  	(cd paper-$(PAPER); $(MAKE) ref.ps)
  
! tut tut.ps:
  	(cd paper-$(PAPER); $(MAKE) tut.ps)
  
! inst inst.ps:
  	(cd paper-$(PAPER); $(MAKE) inst.ps)
  
! dist dist.ps:
  	(cd paper-$(PAPER); $(MAKE) dist.ps)
  
--- 93,121 ----
  
  # Targets for each document:
! api.ps:
  	(cd paper-$(PAPER); $(MAKE) api.ps)
  
! doc.ps:
  	(cd paper-$(PAPER); $(MAKE) doc.ps)
  
! ext.ps:
  	(cd paper-$(PAPER); $(MAKE) ext.ps)
  
! lib.ps:
  	(cd paper-$(PAPER); $(MAKE) lib.ps)
  
! mac.ps:
  	(cd paper-$(PAPER); $(MAKE) mac.ps)
  
! ref.ps:
  	(cd paper-$(PAPER); $(MAKE) ref.ps)
  
! tut.ps:
  	(cd paper-$(PAPER); $(MAKE) tut.ps)
  
! inst.ps:
  	(cd paper-$(PAPER); $(MAKE) inst.ps)
  
! dist.ps:
  	(cd paper-$(PAPER); $(MAKE) dist.ps)
  
***************
*** 199,227 ****
  	(cd $(HTMLDIR); $(MAKE) PAPER=$(PAPER) -f ../html/Makefile)
  
! htmlapi:
  	(cd $(HTMLDIR); $(MAKE) PAPER=$(PAPER) -f ../html/Makefile api)
  
! htmldoc:
  	(cd $(HTMLDIR); $(MAKE) PAPER=$(PAPER) -f ../html/Makefile doc)
  
! htmlext:
  	(cd $(HTMLDIR); $(MAKE) PAPER=$(PAPER) -f ../html/Makefile ext)
  
! htmllib:
  	(cd $(HTMLDIR); $(MAKE) PAPER=$(PAPER) -f ../html/Makefile lib)
  
! htmlmac:
  	(cd $(HTMLDIR); $(MAKE) PAPER=$(PAPER) -f ../html/Makefile mac)
  
! htmlref:
  	(cd $(HTMLDIR); $(MAKE) PAPER=$(PAPER) -f ../html/Makefile ref)
  
! htmltut:
  	(cd $(HTMLDIR); $(MAKE) PAPER=$(PAPER) -f ../html/Makefile tut)
  
! htmlinst:
  	(cd $(HTMLDIR); $(MAKE) PAPER=$(PAPER) -f ../html/Makefile inst)
  
! htmldist:
  	(cd $(HTMLDIR); $(MAKE) PAPER=$(PAPER) -f ../html/Makefile dist)
  
--- 202,230 ----
  	(cd $(HTMLDIR); $(MAKE) PAPER=$(PAPER) -f ../html/Makefile)
  
! api htmlapi:
  	(cd $(HTMLDIR); $(MAKE) PAPER=$(PAPER) -f ../html/Makefile api)
  
! doc htmldoc:
  	(cd $(HTMLDIR); $(MAKE) PAPER=$(PAPER) -f ../html/Makefile doc)
  
! ext htmlext:
  	(cd $(HTMLDIR); $(MAKE) PAPER=$(PAPER) -f ../html/Makefile ext)
  
! lib htmllib:
  	(cd $(HTMLDIR); $(MAKE) PAPER=$(PAPER) -f ../html/Makefile lib)
  
! mac htmlmac:
  	(cd $(HTMLDIR); $(MAKE) PAPER=$(PAPER) -f ../html/Makefile mac)
  
! ref htmlref:
  	(cd $(HTMLDIR); $(MAKE) PAPER=$(PAPER) -f ../html/Makefile ref)
  
! tut htmltut:
  	(cd $(HTMLDIR); $(MAKE) PAPER=$(PAPER) -f ../html/Makefile tut)
  
! inst htmlinst:
  	(cd $(HTMLDIR); $(MAKE) PAPER=$(PAPER) -f ../html/Makefile inst)
  
! dist htmldist:
  	(cd $(HTMLDIR); $(MAKE) PAPER=$(PAPER) -f ../html/Makefile dist)