[Python-checkins] python/dist/src/Doc Makefile,1.267,1.268

[fdrake at users.sourceforge.net]

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

Modified Files:
	Makefile 
Log Message:
Adjust the organization a bit and update some of the comments to
better explain what's happening.


Index: Makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/Makefile,v
retrieving revision 1.267
retrieving revision 1.268
diff -C2 -d -r1.267 -r1.268
*** Makefile	27 Sep 2003 07:11:15 -0000	1.267
--- Makefile	27 Sep 2003 07:37:09 -0000	1.268
***************
*** 72,82 ****
  DVIPS=	   dvips -N0 -t $(PAPER)
  
- PWD=$(shell pwd)
- 
- # (The trailing colon in the value is needed; TeX places it's default
- # set of paths at the location of the empty string in the path list.)
- #
- TEXINPUTS=$(PWD)/commontex:
- 
  # 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
--- 72,75 ----
***************
*** 84,90 ****
  # 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=   TEXINPUTS=$(TEXINPUTS) $(PYTHON) $(PWD)/tools/mkhowto
  
  MKDVI=	   $(MKHOWTO) --paper=$(PAPER) --dvi
--- 77,95 ----
  # current implementation and Makefile structure).  We use the GNUish
  # $(shell) function here to work around that restriction by
! # identifying mkhowto and the commontex/ directory using absolute paths.
  #
! PWD=$(shell pwd)
! 
! # (The trailing colon in the value is needed; TeX places it's default
! # set of paths at the location of the empty string in the path list.)
! TEXINPUTS=$(PWD)/commontex:
! 
! # The mkhowto script can be run from the checkout using the first
! # version of this variable definition, or from a preferred version
! # using the second version.  The standard documentation is typically
! # built using the second flavor, where the preferred version is from
! # the Python CVS trunk.
! #MKHOWTO=   TEXINPUTS=$(TEXINPUTS) $(PYTHON) $(PWD)/tools/mkhowto
! MKHOWTO=   TEXINPUTS=$(TEXINPUTS) mkhowto
  
  MKDVI=	   $(MKHOWTO) --paper=$(PAPER) --dvi