Integrate updates to the GNU info conversion.
This includes SF patch #590352 and additional support for more of the custom
markup.
diff --git a/Doc/info/Makefile b/Doc/info/Makefile
index 88c0d6e..008e369 100644
--- a/Doc/info/Makefile
+++ b/Doc/info/Makefile
@@ -34,34 +34,34 @@
 	fi
 
 python$(VERSION)-api.info:	../api/api.tex $(SCRIPTS)
-	EMACS=$(EMACS) $(MKINFO) $< $@
+	EMACS=$(EMACS) $(MKINFO) $< $*.texi $@
 
 python$(VERSION)-ext.info:	../ext/ext.tex $(SCRIPTS)
-	EMACS=$(EMACS) $(MKINFO) $< $@
+	EMACS=$(EMACS) $(MKINFO) $< $*.texi $@
 
 python$(VERSION)-lib.info:	../lib/lib.tex $(SCRIPTS)
-	EMACS=$(EMACS) $(MKINFO) $< $@
+	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) $< $@
+	EMACS=$(EMACS) $(MKINFO) $< $*.texi $@
 
 python$(VERSION)-ref.info:	../ref/ref.tex $(SCRIPTS)
-	EMACS=$(EMACS) $(MKINFO) $< $@
+	EMACS=$(EMACS) $(MKINFO) $< $*.texi $@
 
 python$(VERSION)-tut.info:	../tut/tut.tex $(SCRIPTS)
-	EMACS=$(EMACS) $(MKINFO) $< $@
+	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) $< $@
+	EMACS=$(EMACS) $(MKINFO) $< $*.texi $@
 
 python$(VERSION)-dist.info:	../dist/dist.tex $(SCRIPTS)
-	EMACS=$(EMACS) $(MKINFO) $< $@
+	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) $< $@
+	EMACS=$(EMACS) $(MKINFO) $< $*.texi $@
 
 clean:
 	rm -f *.texi~ *.texi