.Sanitize:

	now use the shortened names
Makefile.in:
	make install-info work on sysV
readline.texi
	fix @include problem

diff --git a/readline/.Sanitize b/readline/.Sanitize
index 6cf2b221f10322dd31c39e9e06402b7f40217bbf..50625e1eb63187f03e97c92d91c68edac8025039 100644 (file)
--- a/readline/.Sanitize
+++ b/readline/.Sanitize
@@ -35,14 +35,14 @@ emacs_keymap.c
 funmap.c
 history.c
 history.h
-history.texinfo
-inc-history.texinfo
-inc-readline.texinfo
+history.texi
+inc-history.texi
+inc-readline.texi
 keymaps.c
 keymaps.h
 readline.c
 readline.h
-readline.texinfo
+readline.texi
 sysdep-norm.h
 sysdep-aix.h
 vi_keymap.c

diff --git a/readline/Makefile.in b/readline/Makefile.in
index 6565e24e5c8e37edc2ce732e84445b4d9a8520ee..4cf743315c81c3f7e909ea440bcf122c2c707cd9 100644 (file)
--- a/readline/Makefile.in
+++ b/readline/Makefile.in
@@ -5,7 +5,7 @@
 
 srcdir = .
 ddestdir = /usr/local
-
+idestdir = /usr/local
 INSTALL_PROG = install -c
 INSTALL_FILE = $(INSTALL_PROG)
 
@@ -104,16 +104,14 @@ readline.tar.Z:   readline.tar
                compress -f readline.tar
 
 install:       includes
-               $(INSTALL_PROG) libreadline.a $(DESTDIR)/libreadline.a.new
-               -mv $(DESTDIR)/libreadline.a.new $(DESTDIR)/libreadline.a
+               $(INSTALL_PROG) libreadline.a $(DESTDIR)/libreadline.an
+               -mv $(DESTDIR)/libreadline.an $(DESTDIR)/libreadline.a
                $(RANLIB) $(DESTDIR)/libreadline.a
 
 install-info: all-info
                for i in *.info* ; do \
                        echo Installing $$i... ; \
-                       (cp $$i $(idestdir)/info/$$i.new \
-                               && mv -f $(idestdir)/info/$$i.new $(idestdir)/info/$$i) \
-                       || exit 1 ; \
+                       cp $$i $(idestdir)/info/$$i ; \
                done
 
 includes:

diff --git a/readline/readline.texi b/readline/readline.texi
index ea6c9ea8585b3e82a684d27a4953a585e253a09d..464f618169ce1197667a47c99065e4f01b6d5bcc 100755 (executable)
--- a/readline/readline.texi
+++ b/readline/readline.texi
@@ -103,7 +103,7 @@ to provide a command line interface.
 * Readline Top::       GNU Readline User's Manual
 * Readline Technical:: GNU Readline Programmer's Manual
 @end menu
-@include inc-readline.texinfo
+@include inc-read.texi
 @node Readline Technical, , Top, Top
 @chapter Readline Programmer's Manual