1 files changed, 20 insertions, 16 deletions

diff --git a/gnu/lib/libreadline/doc/Makefile b/gnu/lib/libreadline/doc/Makefile
index 786e099c09ff..c79ad92b3fe4 100644
--- a/gnu/lib/libreadline/doc/Makefile
+++ b/gnu/lib/libreadline/doc/Makefile
@@ -1,30 +1,34 @@
-# This makefile for Readline library documentation is in -*- text -*- mode.
+# This makefile for History library documentation is in -*- text -*- mode.
 # Emacs likes it that way.
 
-DVIOBJ = readline.dvi history.dvi
-INFOBJ = readline.info history.info
+DOC_SUPPORT = ../../doc-support/
+TEXINDEX    = $(DOC_SUPPORT)/texindex
 
-all: $(DVIOBJ) $(INFOBJ)
+TEX    = tex
+DVIOBJ = history.dvi
+INFOBJ = history.info
 
-readline.dvi: rlman.texinfo rluser.texinfo rltech.texinfo
-	tex rlman.texinfo
-	tex rlman.texinfo
-	mv rlman.dvi readline.dvi
+all: $(DVIOBJ) $(INFOBJ)
 
 history.dvi: hist.texinfo hsuser.texinfo hstech.texinfo
-	tex hist.texinfo
-	tex hist.texinfo
+	$(TEX) hist.texinfo
+	$(TEXINDEX) hist.??
+	$(TEX) hist.texinfo
 	mv hist.dvi history.dvi
 
-readline.info: rlman.texinfo rluser.texinfo rltech.texinfo
-	makeinfo rlman.texinfo
-
 history.info: hist.texinfo hsuser.texinfo hstech.texinfo
 	makeinfo hist.texinfo
 
+./texinfo.tex: $(DOC_SUPPORT)texinfo.tex
+	ln -s $(DOC_SUPPORT)texinfo.tex .
+
+$(TEXINDEX):
+	(cd $(DOC_SUPPORT); $(MAKE) $(MFLAGS) CFLAGS='$(CFLAGS)' texindex)
+
 clean:
-	rm -f *.log *.cp *.ky *.tp *.vr *.fn *.aux *.pg *.toc core
+	rm -f *.aux *.cp *.fn *.ky *.log *.pg *.toc *.tp *.vr *.cps *.pgs \
+	      *.fns *.kys *.tps *.vrs *.o core texinfo.tex
 
 squeaky-clean:
-	rm -f *.log *.cp *.ky *.tp *.vr *.fn *.aux *.pg *.toc core *.dvi *.~* *.info
-
+	rm -f *.aux *.cp *.fn *.ky *.log *.pg *.toc *.tp *.vr *.cps *.pgs \
+	      *.dvi *.info *.info-* *.fns *.kys *.tps *.vrs *.o core