Import of readline 4.3.

Non-readline modified files:

src/gdb/ChangeLog src/gdb/defs.h src/gdb/cli/cli-cmds.c
src/gdb/cli/cli-setshow.c src/gdb/tui/ChangeLog
src/gdb/tui/tuiWin.c

In readline directory:

        * compat.c, mbutil.c, misc.c, rlmbutil.h, rltypedefs.h,
        text.c, doc/history.0, doc/history.3, support/wcwidth.c,
        examples/readlinebuf.h, examples/rlcat.c: New files.

        * CHANGELOG, CHANGES, INSTALL,  MANIFEST, Makefile.in, README,
        aclocal.m4, ansi_stdlib.h, bind.c, callback.c, chardefs.h,
        complete.c, config.h.in, configure, configure.in, display.c,
        emacs_keymap.c, funmap.c, histexpand.c, histfile.c, histlib.h,
        history.c, history.h, histsearch.c, input.c, isearch.c,
        keymaps.c, keymaps.h, kill.c, macro.c, nls.c, parens.c,
        posixdir.h, readline.c, readline.h, rlconf.h, rldefs.h,
        rlprivate.h, rlshell.h, rlstdc.h, rltty.c, savestring.c,
        search.c, shell.c, signals.c, terminal.c, tilde.c, tilde.h,
        undo.c, util.c, vi_keymap.c, vi_mode.c, xmalloc.c, xmalloc.h,
        doc/Makefile.in, doc/hist.texinfo, doc/hstech.texinfo,
        doc/hsuser.texinfo, doc/manvers.texinfo, doc/readline.3,
        doc/rlman.texinfo, doc/rltech.texinfo, doc/rluser.texinfo
        doc/rluserman.texinfo, doc/texi2dvi, doc/texi2html,
        shlib/Makefile.in, support/install.sh, support/mkdirs,
        support/mkdist, support/shlib-install, support/shobj-conf,
        examples/Inputrc, examples/Makefile.in, examples/fileman.c,
        examples/histexamp.c, examples/manexamp.c, examples/rl.c,
        examples/rlfe.c, examples/rltest.c, examples/rlversion.c:
        Modified files.

1 files changed, 80 insertions, 27 deletions

diff --git a/readline/doc/Makefile.in b/readline/doc/Makefile.in
index 4a38563e46e..8a85ae17c8b 100644
--- a/readline/doc/Makefile.in
+++ b/readline/doc/Makefile.in
@@ -27,10 +27,16 @@ infodir = @infodir@
 mandir = @mandir@
 manpfx = man
 
-man1ext = 1
-man1dir = $(mandir)/$(manpfx)$(man1ext)
-man3ext = 3
-man3dir = $(mandir)/$(manpfx)$(man3ext)
+man1ext = .1
+man1dir = $(mandir)/$(manpfx)1
+man3ext = .3
+man3dir = $(mandir)/$(manpfx)3
+
+# set this to a value to have the HTML documentation installed
+htmldir =
+
+# Support an alternate destination root directory for package building
+DESTDIR =
 
 SHELL = @MAKE_SHELL@
 RM = rm -f
@@ -63,13 +69,13 @@ GROFF       = groff
 
 DVIOBJ = readline.dvi history.dvi rluserman.dvi
 INFOOBJ = readline.info history.info rluserman.info
-PSOBJ = readline.ps history.ps rluserman.ps
+PSOBJ = readline.ps history.ps rluserman.ps readline_3.ps history_3.ps
 HTMLOBJ = readline.html history.html rluserman.html
-TEXTOBJ = readline.0
+TEXTOBJ = readline.0 history.0
 
 INTERMEDIATE_OBJ = rlman.dvi hist.dvi rluserman.dvi
 
-CREATED_DOCS = $(DVIOBJ) $(INFOOBJ) $(PSOBJ) $(HTMLOBJ) $(TEXTOBJ)
+DIST_DOCS = $(DVIOBJ) $(PSOBJ) $(HTMLOBJ) $(INFOOBJ) $(TEXTOBJ)
 
 .SUFFIXES:      .0 .3 .ps .txt .dvi
 
@@ -112,10 +118,12 @@ history.ps:	history.dvi
 	$(RM) $@
 	$(DVIPS) history.dvi
 
+#
+# This leaves readline.html and rlman.html -- rlman.html is for www.gnu.org
+#
 readline.html:	${RLSRC}
 	$(TEXI2HTML) -menu -monolithic -I $(TEXINPUTDIR) $(srcdir)/rlman.texinfo
 	sed -e 's:rlman.html:readline.html:g' rlman.html > readline.html
-	$(RM) rlman.html
 
 rluserman.html:	${RLSRC}
 	$(TEXI2HTML) -menu -monolithic -I $(TEXINPUTDIR) $(srcdir)/rluserman.texinfo
@@ -133,49 +141,94 @@ text:	$(TEXTOBJ)
 
 readline.0: readline.3
 
+readline_3.ps: readline.3
+	${RM} $@
+	${GROFF} -man < $(srcdir)/readline.3 > $@ 
+
+history.0: history.3
+
+history_3.ps: history.3
+	${RM} $@
+	${GROFF} -man < $(srcdir)/history.3 > $@ 
+
 clean:
 	$(RM) *.aux *.cp *.fn *.ky *.log *.pg *.toc *.tp *.vr *.cps *.pgs \
-	      *.fns *.kys *.tps *.vrs *.bt *.bts *.o core
+	      *.fns *.kys *.tps *.vrs *.bt *.bts *.o core *.core
+
+mostlyclean: clean
 
-distclean: clean
-	$(RM) $(CREATED_DOCS)
+distclean: clean maybe-clean
 	$(RM) $(INTERMEDIATE_OBJ)
 	$(RM) Makefile
 
-mostlyclean: clean
+maybe-clean:
+	-if test "X$(topdir)" != "X$(BUILD_DIR)"; then \
+		$(RM) $(DIST_DOCS); \
+	fi
 
 maintainer-clean: clean
-	$(RM) $(CREATED_DOCS)
+	$(RM) $(DIST_DOCS)
 	$(RM) $(INTERMEDIATE_OBJ)
 	$(RM) Makefile
 
 installdirs:	$(topdir)/support/mkdirs
-	-$(SHELL) $(topdir)/support/mkdirs $(infodir) $(man3dir)
+	-$(SHELL) $(topdir)/support/mkdirs $(DESTDIR)$(infodir) $(DESTDIR)$(man3dir)
+	-if test -n "${htmldir}" ; then \
+		$(SHELL) $(topdir)/support/mkdirs $(DESTDIR)$(htmldir) ; \
+	fi
 
 install:	installdirs
 	if test -f readline.info; then \
-		${INSTALL_DATA} readline.info $(infodir)/readline.info; \
+		${INSTALL_DATA} readline.info $(DESTDIR)$(infodir)/readline.info; \
 	else \
-		${INSTALL_DATA} $(srcdir)/readline.info $(infodir)/readline.info; \
+		${INSTALL_DATA} $(srcdir)/readline.info $(DESTDIR)$(infodir)/readline.info; \
 	fi
 	if test -f rluserman.info; then \
-		${INSTALL_DATA} rluserman.info $(infodir)/rluserman.info; \
+		${INSTALL_DATA} rluserman.info $(DESTDIR)$(infodir)/rluserman.info; \
 	else \
-		${INSTALL_DATA} $(srcdir)/rluserman.info $(infodir)/rluserman.info; \
+		${INSTALL_DATA} $(srcdir)/rluserman.info $(DESTDIR)$(infodir)/rluserman.info; \
 	fi
 	if test -f history.info; then \
-		${INSTALL_DATA} history.info $(infodir)/history.info; \
+		${INSTALL_DATA} history.info $(DESTDIR)$(infodir)/history.info; \
 	else \
-		${INSTALL_DATA} $(srcdir)/history.info $(infodir)/history.info; \
+		${INSTALL_DATA} $(srcdir)/history.info $(DESTDIR)$(infodir)/history.info; \
 	fi
 	-if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-		install-info --dir-file=$(infodir)/dir $(infodir)/readline.info ; \
-		install-info --dir-file=$(infodir)/dir $(infodir)/history.info ; \
+		install-info --dir-file=$(DESTDIR)$(infodir)/dir \
+			$(DESTDIR)$(infodir)/readline.info ; \
+		install-info --dir-file=$(DESTDIR)$(infodir)/dir \
+			$(DESTDIR)$(infodir)/history.info ; \
+		install-info --dir-file=$(DESTDIR)$(infodir)/dir \
+			$(DESTDIR)$(infodir)/rluserman.info ; \
 	else true; fi
-	-${INSTALL_DATA} $(srcdir)/readline.3 $(man3dir)/readline.3
+	-${INSTALL_DATA} $(srcdir)/readline.3 $(DESTDIR)$(man3dir)/readline$(man3ext)
+	-${INSTALL_DATA} $(srcdir)/history.3 $(DESTDIR)$(man3dir)/history$(man3ext)
+	-if test -n "${htmldir}" ; then \
+		if test -f readline.html; then \
+			${INSTALL_DATA} readline.html $(DESTDIR)$(htmldir)/readline.html; \
+		else \
+			${INSTALL_DATA} $(srcdir)/readline.html $(DESTDIR)$(htmldir)/readline.html; \
+		fi ; \
+		if test -f history.html; then \
+			${INSTALL_DATA} history.html $(DESTDIR)$(htmldir)/history.html; \
+		else \
+			${INSTALL_DATA} $(srcdir)/history.html $(DESTDIR)$(htmldir)/history.html; \
+		fi ; \
+		if test -f rluserman.html; then \
+			${INSTALL_DATA} rluserman.html $(DESTDIR)$(htmldir)/rluserman.html; \
+		else \
+			${INSTALL_DATA} $(srcdir)/rluserman.html $(DESTDIR)$(htmldir)/rluserman.html; \
+		fi ; \
+	fi
 
 uninstall:
-	$(RM) $(infodir)/readline.info
-	$(RM) $(infodir)/rluserman.info
-	$(RM) $(infodir)/history.info
-	$(RM) $(man3dir)/readline.3
+	$(RM) $(DESTDIR)$(infodir)/readline.info
+	$(RM) $(DESTDIR)$(infodir)/rluserman.info
+	$(RM) $(DESTDIR)$(infodir)/history.info
+	$(RM) $(DESTDIR)$(man3dir)/readline$(man3ext)
+	$(RM) $(DESTDIR)$(man3dir)/history$(man3ext)
+	-if test -n "${htmldir}" ; then \
+		$(RM) $(DESTDIR)$(htmldir)/readline.html ; \
+		$(RM) $(DESTDIR)$(htmldir)/rluserman.html ; \
+		$(RM) $(DESTDIR)$(htmldir)/history.html ; \
+	fi