Clean up damage made when I checked in sanitized version

diff --git a/Makefile.in b/Makefile.in
index a8224466992121d406200130ffb3fbf8b875d0b9..ce118d547c1b062744eb0515494350312df1527c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -197,7 +197,7 @@ XTRAFLAGS = ` \
      echo ; \
   fi`
 
-GNATS = all-gnats
+PRMS = all-prms
 
 #### host and target specific makefile fragments come in here.
 ###
@@ -229,7 +229,7 @@ $(end-sanitize-chill)\
        "LOADLIBES=$(LOADLIBES)" \
        "MAKEINFO=$(MAKEINFO)" \
        "NM_FOR_TARGET=$(NM_FOR_TARGET)" \
-       "GNATS=$(GNATS)" \
+       "PRMS=$(PRMS)" \
        "RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \
        "XTRAFLAGS_FOR_TARGET=$(XTRAFLAGS)" \
        "exec_prefix=$(exec_prefix)" \
@@ -346,7 +346,9 @@ check: do-check
 dvi: do-dvi
 
 install-info: install-info-dirs do-install-info dir.info
-       $(INSTALL_DATA) dir.info $(infodir)/dir.info
+       if [ -f dir.info ] ; then \
+         $(INSTALL_DATA) dir.info $(infodir)/dir.info ; \
+       fi
 
 do-install-info: install-info-dirs
 
@@ -360,7 +362,7 @@ all.normal: all-m4 all-autoconf all-libiberty all-mmalloc all-texinfo \
        $(start-sanitize-chill) \
        all-chillrt \
        $(end-sanitize-chill) \
-       all-gprof all-gnats all-send-pr all-libm all-deja-gnu \
+       all-gprof all-prms all-send-pr all-libm all-deja-gnu \
        all-fileutils all-find all-gawk all-sed all-shellutils \
        all-textutils all-time all-wdiff all-uudecode \
        all-hello all-tar all-gzip all-indent all-recode
@@ -441,7 +443,7 @@ install-no-fixedincludes: install-dirs gcc-no-fixedincludes \
        install-newlib \
        install-opcodes \
        install-patch \
-       install-gnats \
+       install-prms \
        install-rcs \
        install-readline \
        install-recode \
@@ -1142,20 +1144,20 @@ install-ispell: force
                true ; \
        fi
 
-### gnats
-all-gnats: force
-       @if [ -f ./gnats/Makefile ] ; then \
+### prms
+all-prms: force
+       @if [ -f ./prms/Makefile ] ; then \
                rootme=`pwd` ; export rootme ; \
-               (cd ./gnats; \
+               (cd ./prms; \
                $(MAKE) $(FLAGS_TO_PASS) all) ; \
        else \
                true ; \
        fi
 
-install-gnats: force
-       @if [ -f ./gnats/Makefile ] ; then \
+install-prms: force
+       @if [ -f ./prms/Makefile ] ; then \
                rootme=`pwd` ; export rootme ; \
-               (cd ./gnats; \
+               (cd ./prms; \
                $(MAKE) $(FLAGS_TO_PASS) install) ; \
        else \
                true ; \
@@ -1269,7 +1271,7 @@ all-expect: all-tcl
                rootme=`pwd` ; export rootme ; \
                srcroot=`cd $(srcdir); pwd`; export srcroot ; \
                (cd ./expect; \
-               $(MAKE) $(FLAGS_TO_PASS) all) ; \
+               $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all) ; \
        else \
                true ; \
        fi
@@ -1279,7 +1281,7 @@ install-expect: force
                rootme=`pwd` ; export rootme ; \
                srcroot=`cd $(srcdir); pwd`; export srcroot ; \
                (cd ./expect; \
-               $(MAKE) $(FLAGS_TO_PASS) install) ; \
+               $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install) ; \
        else \
                true ; \
        fi
@@ -1521,8 +1523,10 @@ install-info-dirs:
        -if [ -d $(infodir) ] ; then true ; else mkdir $(infodir) ; fi
 
 dir.info: do-install-info
-       $(srcdir)/texinfo/gen-info-dir $(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new
-       mv -f dir.info.new dir.info
+       if [ -f $(srcdir)/texinfo/gen-info-dir ] ; then \
+         $(srcdir)/texinfo/gen-info-dir $(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new ; \
+         mv -f dir.info.new dir.info ; \
+       fi
 
 dist:
        @echo "Building a full distribution of this tree isn't done"
@@ -1560,7 +1564,7 @@ DEVO_SUPPORT= README Makefile.in configure configure.in \
        config.guess config.sub config move-if-change
 ETC_SUPPORT= Makefile.in cfg-paper.texi configure.in configure.man \
        configure.texi
-GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes readline glob
+GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes readline glob sim
 GDB_SUPPORT_FILES= $(GDB_SUPPORT_DIRS)
 
 setup-dirs: force