exploit the new executable config.status

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 1c3d4a0e5db22dd23b3cb0d871a885be5292834d..6fd90f994ded3a239cf1be3adaa4bc0f65ecba08 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -132,7 +132,7 @@ CDEPS = ${XM_CDEPS} ${TM_CDEPS} ${BFD_LIB} ${LIBIBERTY} ${RL_LIB}
 ADD_FILES = ${REGEX} ${ALLOCA}  ${GNU_MALLOC} ${XM_ADD_FILES} ${TM_ADD_FILES}
 ADD_DEPS = ${REGEX1} ${ALLOCA1} ${GNU_MALLOC} ${XM_ADD_FILES} ${TM_ADD_FILES}
 
-VERSION = 4.0.95
+VERSION = 4.1.1
 DIST=gdb
 
 LINT=/usr/5bin/lint
@@ -553,12 +553,8 @@ de-stage3: force
        - (cd stage3 ; mv -f * ..)
        - rmdir stage3
 
-Makefile: $(srcdir)/Makefile.in $(srcdir)/configure
-       (cd $(srcdir) ; \
-               ./configure +destdir=$(destdir) \
-               +norecurse \
-               `if [ "$(srcdir)" != "." ] ; then echo +subdirs; fi` \
-               $(host) +target=$(target))
+Makefile: $(srcdir)/Makefile.in $(srcdir)/configure $(host_makefile_frag) $(target_makefile_frag)
+       $(SHELL) ./config.status
 
 force:
 

diff --git a/readline/Makefile.in b/readline/Makefile.in
index 8b6ebe58b3fed04e09b0ad035c68dfe3375e0d07..5c23b088177ad3d419dcad01457dd7dfa8730f81 100644 (file)
--- a/readline/Makefile.in
+++ b/readline/Makefile.in
@@ -1,8 +1,7 @@
-## -*- text -*- ####################################################
 #                                                                 #
 # Makefile for readline and history libraries.                    #
 #                                                                 #
-####################################################################
+
 
 srcdir = .
 destdir = /usr/local
@@ -27,9 +26,6 @@ INCDIR = $(destdir)/include
 # a return type of "void" for signal handlers.
 TYPES = -DVOID_SIGHANDLER
 
-# Define SYSV as -DSYSV if you are using a System V operating system.
-#SYSV = -DSYSV
-
 # HP-UX compilation requires the BSD library.
 #LOCAL_LIBS = -lBSD
 
@@ -105,14 +101,16 @@ includes:
                 mkdir $(INCDIR)/readline;\
                 chmod a+r $(INCDIR)/readline;\
                fi
-               $(INSTALL_FILE) readline.h keymaps.h chardefs.h $(INCDIR)/readline/
+               $(INSTALL_FILE) $(srcdir)/readline.h $(INCDIR)/readline/
+               $(INSTALL_FILE) $(srcdir)/keymaps.h $(INCDIR)/readline/
+               $(INSTALL_FILE) $(srcdir)/chardefs.h $(INCDIR)/readline/
 clean:
                rm -f $(STAGESTUFF) *.a *.log *.cp *.tp *.vr *.fn *.aux *.pg *.toc
 
 $(DESTDIR)/libreadline.a: libreadline.a
                -mv $(DESTDIR)/libreadline.a $(DESTDIR)/libreadline.old
                $(INSTALL_PROG) libreadline.a $(DESTDIR)/libreadline.a
-               $(RANLIB) -t $(DESTDIR)/libreadline.a
+               $(RANLIB) $(DESTDIR)/libreadline.a
 
 # Copy the object files from a particular stage into a subdirectory.
 stage1: force
@@ -148,9 +146,5 @@ force:
 
 # with the gnu make, this is done automatically.
 
-Makefile: $(srcdir)/Makefile.in $(srcdir)/configure
-       (cd $(srcdir) ; \
-               ./configure +destdir=$(destdir) +norecurse \
-                `if [ "$(srcdir)" != "." ] ; then echo +f; fi` \
-               $(host) +target=$(target))
-
+Makefile: $(srcdir)/Makefile.in $(srcdir)/configure $(host_makefile_frag) $(target_makefile_frag)
+       $(SHELL) ./config.status