[Python-checkins] python/dist/src/Doc Makefile,1.261.4.2,1.261.4.3

[fdrake at users.sourceforge.net]

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

Modified Files:
      Tag: release23-maint
	Makefile 
Log Message:
- bump version info
- backport changes from trunk revisions 1.265, 1.266 (separate
  definition of the mkhowto script location from the invocations of
  the script)


Index: Makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/Makefile,v
retrieving revision 1.261.4.2
retrieving revision 1.261.4.3
diff -C2 -d -r1.261.4.2 -r1.261.4.3
*** Makefile	23 Sep 2003 05:25:09 -0000	1.261.4.2
--- Makefile	27 Sep 2003 06:01:35 -0000	1.261.4.3
***************
*** 67,88 ****
  # This is the *documentation* release, and is used to construct the file
  # names of the downloadable tarballs.
! RELEASE=2.3.1
  
  PYTHON=	   python
  DVIPS=	   dvips -N0 -t $(PAPER)
  
! MKDVI=	   $(PYTHON) ../tools/mkhowto --paper=$(PAPER) --dvi
! MKHTML=	   $(PYTHON) tools/mkhowto --html --about html/stdabout.dat \
  		--iconserver ../icons --favicon ../icons/pyfav.gif \
  		--address $(PYTHONDOCS) --up-link ../index.html \
  		--up-title "Python Documentation Index" \
  		--global-module-index "../modindex.html" --dvips-safe
! MKISILOHTML=$(PYTHON) tools/mkhowto --html --about html/stdabout.dat \
  		--iconserver ../icons \
  		--l2h-init perl/isilo.perl --numeric --split 1 \
  		--dvips-safe
  MKISILO=   iSilo386 -U -y -rCR -d0
! MKPDF=	   $(PYTHON) ../tools/mkhowto --paper=$(PAPER) --pdf
! MKPS=	   $(PYTHON) ../tools/mkhowto --paper=$(PAPER) --ps
  
  BUILDINDEX=$(TOOLSDIR)/buildindex.py
--- 67,97 ----
  # This is the *documentation* release, and is used to construct the file
  # names of the downloadable tarballs.
! RELEASE=2.3.2c1
  
  PYTHON=	   python
  DVIPS=	   dvips -N0 -t $(PAPER)
  
! # This is ugly!  The issue here is that there are two different levels
! # in the directory tree at which we execute mkhowto, so we can't
! # define it just once using a relative path (at least not with the
! # current implementation and Makefile structure).  We use the GNUish
! # $(shell) function here to work around that restriction by
! # identifying mkhowto using an absolute path.
! #
! MKHOWTO=   $(PYTHON) $(shell pwd)/tools/mkhowto
! 
! MKDVI=	   $(MKHOWTO) --paper=$(PAPER) --dvi
! MKHTML=	   $(MKHOWTO) --html --about html/stdabout.dat \
  		--iconserver ../icons --favicon ../icons/pyfav.gif \
  		--address $(PYTHONDOCS) --up-link ../index.html \
  		--up-title "Python Documentation Index" \
  		--global-module-index "../modindex.html" --dvips-safe
! MKISILOHTML=$(MKHOWTO) --html --about html/stdabout.dat \
  		--iconserver ../icons \
  		--l2h-init perl/isilo.perl --numeric --split 1 \
  		--dvips-safe
  MKISILO=   iSilo386 -U -y -rCR -d0
! MKPDF=	   $(MKHOWTO) --paper=$(PAPER) --pdf
! MKPS=	   $(MKHOWTO) --paper=$(PAPER) --ps
  
  BUILDINDEX=$(TOOLSDIR)/buildindex.py