[Python-checkins] python/dist/src/Doc/info Makefile,1.8,1.8.2.1

[jhylton@users.sourceforge.net]

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

Modified Files:
      Tag: ast-branch
	Makefile 
Log Message:
Merge head to this branch.

Merge all sorts of changes from just before 2.3b1 into the ast
branch.  This should make the eventual merge back to the trunk easier.

The merge is almost entirely porting changes into the ast-branch.
There was no attempt to get changes to compile.c into newcompile.c.
That work should be done when newcompile.c is closer to completion.

The only significant conflicts appeared to be in pythonrun.c.


Index: Makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/info/Makefile,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -d -r1.8 -r1.8.2.1
*** Makefile	3 May 2002 04:50:51 -0000	1.8
--- Makefile	28 Apr 2003 17:38:01 -0000	1.8.2.1
***************
*** 35,66 ****
  
  python$(VERSION)-api.info:	../api/api.tex $(SCRIPTS)
! 	EMACS=$(EMACS) $(MKINFO) $< $@
  
  python$(VERSION)-ext.info:	../ext/ext.tex $(SCRIPTS)
! 	EMACS=$(EMACS) $(MKINFO) $< $@
  
  python$(VERSION)-lib.info:	../lib/lib.tex $(SCRIPTS)
! 	EMACS=$(EMACS) $(MKINFO) $< $@
  
  # Not built by default; the conversion doesn't really handle it well.
  python$(VERSION)-mac.info:	../mac/mac.tex $(SCRIPTS)
! 	EMACS=$(EMACS) $(MKINFO) $< $@
  
  python$(VERSION)-ref.info:	../ref/ref.tex $(SCRIPTS)
! 	EMACS=$(EMACS) $(MKINFO) $< $@
  
  python$(VERSION)-tut.info:	../tut/tut.tex $(SCRIPTS)
! 	EMACS=$(EMACS) $(MKINFO) $< $@
  
  # Not built by default; the conversion doesn't handle it at all.
  python$(VERSION)-doc.info:	../doc/doc.tex $(SCRIPTS)
! 	EMACS=$(EMACS) $(MKINFO) $< $@
  
  python$(VERSION)-dist.info:	../dist/dist.tex $(SCRIPTS)
! 	EMACS=$(EMACS) $(MKINFO) $< $@
  
  # Not built by default; the conversion chokes on two @end multitable's
  python$(VERSION)-inst.info:	../inst/inst.tex $(SCRIPTS)
! 	EMACS=$(EMACS) $(MKINFO) $< $@
  
  clean:
--- 35,66 ----
  
  python$(VERSION)-api.info:	../api/api.tex $(SCRIPTS)
! 	EMACS=$(EMACS) $(MKINFO) $< $*.texi $@
  
  python$(VERSION)-ext.info:	../ext/ext.tex $(SCRIPTS)
! 	EMACS=$(EMACS) $(MKINFO) $< $*.texi $@
  
  python$(VERSION)-lib.info:	../lib/lib.tex $(SCRIPTS)
! 	EMACS=$(EMACS) $(MKINFO) $< $*.texi $@
  
  # Not built by default; the conversion doesn't really handle it well.
  python$(VERSION)-mac.info:	../mac/mac.tex $(SCRIPTS)
! 	EMACS=$(EMACS) $(MKINFO) $< $*.texi $@
  
  python$(VERSION)-ref.info:	../ref/ref.tex $(SCRIPTS)
! 	EMACS=$(EMACS) $(MKINFO) $< $*.texi $@
  
  python$(VERSION)-tut.info:	../tut/tut.tex $(SCRIPTS)
! 	EMACS=$(EMACS) $(MKINFO) $< $*.texi $@
  
  # Not built by default; the conversion doesn't handle it at all.
  python$(VERSION)-doc.info:	../doc/doc.tex $(SCRIPTS)
! 	EMACS=$(EMACS) $(MKINFO) $< $*.texi $@
  
  python$(VERSION)-dist.info:	../dist/dist.tex $(SCRIPTS)
! 	EMACS=$(EMACS) $(MKINFO) $< $*.texi $@
  
  # Not built by default; the conversion chokes on two @end multitable's
  python$(VERSION)-inst.info:	../inst/inst.tex $(SCRIPTS)
! 	EMACS=$(EMACS) $(MKINFO) $< $*.texi $@
  
  clean: