Adjust the index inclusion for the new index support.

Doc/api.tex

@@ -2906,6 +2906,6 @@ Py_None, _Py_NoneStruct
 XXX Explain Py_DEBUG, Py_TRACE_REFS, Py_REF_DEBUG.
 
 
-\input{api.ind}			% Index -- must be last
+\inputindex{api.ind}			% Index -- must be last
 
 \end{document}

Doc/api/api.tex

@@ -2906,6 +2906,6 @@ Py_None, _Py_NoneStruct
 XXX Explain Py_DEBUG, Py_TRACE_REFS, Py_REF_DEBUG.
 
 
-\input{api.ind}			% Index -- must be last
+\inputindex{api.ind}			% Index -- must be last
 
 \end{document}

Doc/ext.tex

@@ -1489,8 +1489,6 @@ whitespace-separated absolute pathnames of libraries (\samp{.a}
 files).  No \samp{-l} options can be used.
 
 
-%\input{extref}
-
-\input{ext.ind}
+\inputindex{ext.ind}
 
 \end{document}

Doc/ext/ext.tex

@@ -1489,8 +1489,6 @@ whitespace-separated absolute pathnames of libraries (\samp{.a}
 files).  No \samp{-l} options can be used.
 
 
-%\input{extref}
-
-\input{ext.ind}
+\inputindex{ext.ind}
 
 \end{document}

Doc/lib.tex

@@ -8,7 +8,9 @@
 
 \input{boilerplate}
 
-\makeindex			% tell \index to actually write the .idx file
+\makeindex			% tell \index to actually write the
+				% .idx file
+\makemodindex			% ... and the module index as well.
 
 
 \begin{document}
@@ -222,9 +224,11 @@ add new extensions to Python and how to embed it in other applications.
 \input{libundoc}
 
 \renewcommand{\indexname}{Module Index}
-\input{modlib.ind}		% Module Index
+\renewcommand{\indexlabel}{modindex}
+\inputindex{modlib.ind}		% Module Index
 
 \renewcommand{\indexname}{Index}
-\input{lib.ind}			% Index
+\renewcommand{\indexlabel}{genindex}
+\inputindex{lib.ind}			% Index
 
 \end{document}

Doc/lib/lib.tex

@@ -8,7 +8,9 @@
 
 \input{boilerplate}
 
-\makeindex			% tell \index to actually write the .idx file
+\makeindex			% tell \index to actually write the
+				% .idx file
+\makemodindex			% ... and the module index as well.
 
 
 \begin{document}
@@ -222,9 +224,11 @@ add new extensions to Python and how to embed it in other applications.
 \input{libundoc}
 
 \renewcommand{\indexname}{Module Index}
-\input{modlib.ind}		% Module Index
+\renewcommand{\indexlabel}{modindex}
+\inputindex{modlib.ind}		% Module Index
 
 \renewcommand{\indexname}{Index}
-\input{lib.ind}			% Index
+\renewcommand{\indexlabel}{genindex}
+\inputindex{lib.ind}			% Index
 
 \end{document}