Commits

cvs  committed 8626e45

Import from CVS: tag r21-2-5

  • Participants
  • Parent commits 76b7d63
  • Tags r21-2-5

Comments (0)

Files changed (302)

File CHANGES-beta

 							-*- indented-text -*-
+to 21.2 beta5 "Aphrodite"
+-- bytecode interpreter rewritten
+-- byte compiler fixes
+-- hash table implementation rewritten
+-- basic lisp functions rewritten
+-- spelling fixes
+-- garbage collector tuned a little
+-- various global code changes for consistency
+-- automated test suite
+-- major internals manual updates
+-- lisp reference updates
+
 to 21.2 beta4 "Aglaophonos"
 -- isearch keymap fix from Katsumi Yamaoka
 -- directory_files cleanup from Hrvoje Niksic
+1998-12-05  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.2.5 is released
+
 1998-11-28  SL Baur  <steve@altair.xemacs.org>
 
 	* XEmacs 21.2-beta4 is released.
 variable CFLAGS is consulted.  If that is also undefined, CFLAGS
 defaults to "-g -O" for gcc and "-g" for all other compilers.
 
-The `--with-gnu-make' option specifies that Makefiles should be
-written to take advantage of special features of GNU Make.  GNU Make
-works fine on Makefiles even without this option.  This flag just
-allows for simultaneous in-place and --srcdir building.
-
 The `--dynamic' option specifies that configure should try to link
 emacs dynamically rather than statically.
 
 the command.  See the section below called `MAKE VARIABLES' for more
 information on this.
 
+Using GNU Make allows for simultaneous builds with and without the
+--srcdir option.
+
 8) If your system uses lock files to interlock access to mailer inbox files,
 then you might need to make the movemail program setuid or setgid
 to enable it to write the lock files.  We believe this is safe.

File Makefile.in

-## DIST: This is the distribution Makefile for XEmacs.  configure can
-## DIST: make most of the changes to this file you might want, so try
-## DIST: that first.
-
-## This file is part of XEmacs.
-
-## XEmacs is free software; you can redistribute it and/or modify it
-## under the terms of the GNU General Public License as published by the
-## Free Software Foundation; either version 2, or (at your option) any
-## later version.
-
-## XEmacs is distributed in the hope that it will be useful, but WITHOUT
-## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-## FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-## for more details.
-
-## You should have received a copy of the GNU General Public License
-## along with XEmacs; see the file COPYING.  If not, write to
-## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-## Boston, MA 02111-1307, USA.
-
-## make all	to compile and build XEmacs.
-## make install	to build and install it.
-## make install-only	to install after a previous complete build
-## make TAGS	to update tags tables.
-
-## make clean  or  make mostlyclean
-##      Delete all files from the current directory that are normally
-##      created by building the program.	 Don't delete the files that
-##      record the configuration.  Also preserve files that could be made
-##      by building, but normally aren't because the distribution comes
-##      with them.
-
-##      Delete `.dvi' files here if they are not part of the distribution.
-
-## make distclean
-##      Delete all files from the current directory that are created by
-##      configuring or building the program.  If you have unpacked the
-##      source and built the program without creating any other files,
-##      `make distclean' should leave only the files that were in the
-##      distribution.
-
-## make realclean
-##      Delete everything from the current directory that can be
-##      reconstructed with this Makefile.  This typically includes
-##      everything deleted by distclean, plus more: C source files
-##      produced by Bison, tags tables, info files, and so on.
-
-## make extraclean
-##      Still more severe - delete backup and autosave files, too.
-
-@SET_MAKE@
-RECURSIVE_MAKE=@RECURSIVE_MAKE@
-SHELL = /bin/sh
-LANG = C
-RM = rm -f
-pwd = /bin/pwd
-
-## ==================== Things `configure' Might Edit ====================
-
-CC=@CC@
-CPP=@CPP@
-LN_S=@LN_S@
-CFLAGS=@CFLAGS@
-CPPFLAGS=@CPPFLAGS@
-LDFLAGS=@LDFLAGS@
-
-## These help us choose version- and architecture-specific directories
-## to install files in.
-
-## This should be the number of the XEmacs version we're building,
-## like `19.12' or `19.13'.
-version=@version@
-
-## This should be the name of the configuration we're building XEmacs
-## for, like `mips-dec-ultrix' or `sparc-sun-sunos'.
-configuration=@configuration@
-
-## This will be the name of the generated binary and is set automatically
-## by configure.
-PROGNAME=@PROGNAME@
-
-## ==================== Where To Install Things ====================
-
-## The default location for installation.  Everything is placed in
-## subdirectories of this directory.  The default values for many of
-## the variables below are expressed in terms of this one, so you may
-## not need to change them.  This defaults to /usr/local.
-prefix=@prefix@
-
-## Like `prefix', but used for architecture-specific files.
-exec_prefix=@exec_prefix@
-
-## Where to install XEmacs and other binaries that people will want to
-## run directly (like etags).
-bindir=@bindir@
-
-## Where to install architecture-independent data files.
-## ${lispdir} and ${etcdir} are subdirectories of this.
-datadir=@datadir@
-
-## Where to find XEmacs packages.
-pkgdir=@pkgdir@
-
-## Where to install and expect the files that XEmacs modifies as it runs.
-## These files are all architecture-independent. Right now, the
-## only such data is the locking directory;
-## ${lockdir} is a subdirectory of this.
-statedir=@statedir@
-
-## Where to install and expect executable files to be run by XEmacs
-## rather than directly by users, and other architecture-dependent data
-## ${archlibdir} is a subdirectory of this.
-libdir=@libdir@
-
-## Where to install XEmacs's man pages, and what extension they should have.
-mandir=@mandir@
-manext=.1
-
-## Where to install and expect the info files describing XEmacs.  In the
-## past, this defaulted to a subdirectory of ${prefix}/lib/xemacs, but
-## since there are now many packages documented with the texinfo
-## system, it is inappropriate to imply that it is part of XEmacs.
-infodir=@infodir@
-
-## Document me.
-## See callproc.c for code which references this.
-infopath=@infopath@
-
-## Where to find the source code.  The source code for XEmacs's C kernel is
-## expected to be in ${srcdir}/src, and the source code for XEmacs's
-## utility programs is expected to be in ${srcdir}/lib-src.  This is
-## set by the configure script's `--srcdir' option.
-srcdir=@srcdir@
-
-## Where the build is done.
-blddir=@blddir@
-
-## ==================== XEmacs-specific directories ====================
-
-## These variables hold the values XEmacs will actually use.  They are
-## based on the values of the standard Make variables above.
-
-## Where to install the lisp files distributed with
-## XEmacs.  This includes the XEmacs version, so that the
-## lisp files for different versions of XEmacs will install
-## themselves in separate directories.
-lispdir=@lispdir@
-
-## Directory XEmacs should search for lisp files specific
-## to this site (i.e. customizations), before consulting
-## ${lispdir}.
-sitelispdir=@sitelispdir@
-
-## Where XEmacs will search for its lisp files while
-## building.  This is only used during the process of
-## compiling XEmacs, to help XEmacs find its lisp files
-## before they've been installed in their final location.
-## It's usually identical to lispdir, except that the
-## entry for the directory containing the installed lisp
-## files has been replaced with ../lisp.  This should be a
-## colon-separated list of directories.
-buildlispdir=${srcdir}/lisp
-
-## Where to install the other architecture-independent
-## data files distributed with XEmacs (like the tutorial,
-## the cookie recipes and the Zippy database). This path
-## usually contains the XEmacs version number, so the data
-## files for multiple versions of XEmacs may be installed
-## at once.
-etcdir=@etcdir@
-
-## Where to create and expect the locking directory, where
-## the XEmacs locking code keeps track of which files are
-## currently being edited.
-lockdir=@lockdir@
-
-## Where to put executables to be run by XEmacs rather than
-## the user.  This path usually includes the XEmacs version
-## and configuration name, so that multiple configurations
-## for multiple versions of XEmacs may be installed at
-## once.
-archlibdir=@archlibdir@
-
-## ==================== Utility Programs for the Build ====================
-
-## Allow the user to specify the install program.
-INSTALL = @install_pp@ @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-
-## ============================= Targets ==============================
-
-## Subdirectories to make recursively.  `lisp' is not included
-## because the compiled lisp files are part of the distribution
-## and you cannot remake them without installing XEmacs first.
-MAKE_SUBDIR = @MAKE_SUBDIR@
-
-## Subdirectories that can be made recursively.
-SUBDIR = ${MAKE_SUBDIR} man
-
-## The makefiles of the directories in ${MAKE_SUBDIR}.
-SUBDIR_MAKEFILES = @SUBDIR_MAKEFILES@
-
-## Subdirectories to `make install-arch-dep' recursively
-INSTALL_ARCH_DEP_SUBDIR = @INSTALL_ARCH_DEP_SUBDIR@
-
-## Subdirectories to install, and where they'll go.
-## lib-src's makefile knows how to install it, so we don't do that here.
-## When installing the info files, we need to do special things to
-## avoid nuking an existing dir file, so we don't do that here;
-## instead, we have written out explicit code in the `install' targets.
-COPYDIR = ${srcdir}/etc ${srcdir}/lisp
-COPYDESTS = ${etcdir} ${lispdir}
-GENERATED_HEADERS = src/paths.h src/Emacs.ad.h src/puresize-adjust.h src/config.h lwlib/config.h src/sheap-adjust.h
-GENERATED_LISP = lisp/finder-inf.el
-
-all: ${PROGNAME} all-elc info
-
-${PROGNAME}:	${GENERATED_HEADERS} ${MAKE_SUBDIR} ${GENERATED_LISP}
-
-## For performance and consistency, no built-in rules
-.SUFFIXES:
-
-.NO_PARALLEL:	${GENERATED_HEADERS} ${MAKE_SUBDIR} dump-elcs
-.PHONY: ${SUBDIR} all beta all-elc all-elcs dump-elc dump-elcs autoloads finder
-
-## Convenience target for XEmacs beta testers
-beta: clean all-elc finder
-
-## Convenience target for XEmacs maintainers
-## This would run `make-xemacsdist' if I were really confident that everything
-## was turnkey.
-dist: all-elc info
-
-## Convenience target for XEmacs maintainers
-## Updates some rarely generated files:
-## - configure from configure.in
-## - config.values.in from configure
-## - src/depend from src/*.[ch]
-.PHONY: config configure depend
-config: configure depend
-configure: ${srcdir}/configure
-${srcdir}/configure: ${srcdir}/configure.in
-	cd ${srcdir} && autoconf
-	cd ${srcdir} && /bin/sh lib-src/config.values.sh
-
-depend ${srcdir}/src/depend:
-	cd ${srcdir}/src && \
-		perl ./make-src-depend > depend.tmp && \
-		$(RM) depend && mv depend.tmp depend
-
-## Build XEmacs and recompile out-of-date and missing .elc files along
-## the way.
-all-elc all-elcs: lib-src lwlib dump-elcs src
-	MAKE='$(MAKE)' EMACS='./src/$(PROGNAME)' sh ${srcdir}/lib-src/update-elc.sh
-
-## Sub-target for all-elc.
-dump-elc dump-elcs: ${GENERATED_HEADERS} FRC.dump-elcs
-	cd ./src && $(RECURSIVE_MAKE) dump-elcs
-
-autoloads: src
-	MAKE='$(MAKE)' EMACS='./src/$(PROGNAME)' sh ${srcdir}/lib-src/update-autoloads.sh
-
-custom-loads:
-	MAKE='$(MAKE)' EMACS='./src/$(PROGNAME)' sh ${srcdir}/lib-src/update-custom.sh
-
-finder: src
-	@echo "Building finder database ..."
-	@(cd ./lisp; \
-		${blddir}/src/${PROGNAME} -batch -vanilla \
-		-eval '(setq finder-compile-keywords-quiet t)' \
-		-l finder -f finder-compile-keywords )
-	@echo "Building finder database ...(done)"
-
-lisp/finder-inf.el:
-	@echo "Building finder database ..."
-	@(cd ./lisp; \
-		${blddir}/src/${PROGNAME} -batch -vanilla \
-		-eval '(setq finder-compile-keywords-quiet t)' \
-		-l finder -f finder-compile-keywords )
-	@echo "Building finder database ...(done)"
-
-## We have to force the building of Emacs.ad.h as well in order to get it
-## updated correctly when VPATH is being used.  Since we use move-if-change,
-## it will only actually change if the user modified ${etcdir}/Emacs.ad.
-src/Emacs.ad.h: ${srcdir}/etc/Emacs.ad
-	@echo "Producing \`src/Emacs.ad.h' from \`etc/Emacs.ad'."
-	@$(RM) src/Emacs.ad.h
-	@(echo "/*	Do not edit this file!" ; \
-	  echo "  	Automatically generated from ${srcdir}/etc/Emacs.ad" ; \
-	  echo " */" ; \
-	  /bin/sh ${srcdir}/lib-src/ad2c ${srcdir}/etc/Emacs.ad ) > \
-	  src/Emacs.ad.h
-
-src/puresize-adjust.h:	${srcdir}/src/puresize.h
-	@echo "Resetting \`src/puresize-adjust.h'."; \
-	(echo "/*	Do not edit this file!" ; \
-	 echo "  	Automatically generated by XEmacs */" ; \
-	 echo "#define PURESIZE_ADJUSTMENT 0") > $@
-
-src/sheap-adjust.h:
-	@echo "Resetting \`src/sheap-adjust.h'."; \
-	(echo "/*	Do not edit this file!" ; \
-	 echo "  	Automatically generated by XEmacs */" ; \
-	 echo "#define SHEAP_ADJUSTMENT 0") > $@
-
-src: @SRC_SUBDIR_DEPS@ FRC.src
-pkg-src/tree-x: pkg-src/FRC.tree-x
-lib-src: FRC.lib-src
-lwlib:	FRC.lwlib
-dynodump: FRC.dynodump
-FRC.src FRC.lib-src FRC.lwlib FRC.dynodump pkg-src/FRC.tree-x:
-FRC.lisp.finder-inf.el:
-
-${SUBDIR}: ${SUBDIR_MAKEFILES} ${GENERATED_HEADERS} FRC
-	cd ./$@ && $(RECURSIVE_MAKE) all
-
-Makefile: ${srcdir}/Makefile.in config.status
-	./config.status
-
-src/Makefile: ${srcdir}/src/Makefile.in.in ${srcdir}/src/depend config.status
-	./config.status
-
-lib-src/Makefile: ${srcdir}/lib-src/Makefile.in.in config.status
-	./config.status
-
-lwlib/Makefile: ${srcdir}/lwlib/Makefile.in.in config.status
-	./config.status
-
-pkg-src/tree-x/Makefile: ${srcdir}/pkg-src/tree-x/Makefile.in.in config.status
-	./config.status
-
-src/config.h: ${srcdir}/src/config.h.in
-	./config.status && touch $@
-
-src/paths.h: ${srcdir}/src/paths.h.in
-	./config.status && touch $@
-
-lwlib/config.h: ${srcdir}/lwlib/config.h.in
-	./config.status && touch $@
-
-## ==================== Installation ====================
-
-## If we let lib-src do its own installation, that means we
-## don't have to duplicate the list of utilities to install in
-## this Makefile as well.
-
-## On AIX, use tar xBf.
-## On Xenix, use tar xpf.
-
-.PHONY: install-only install install-arch-dep install-arch-indep gzip.el mkdir
-.PHONY: check-features
-
-## We delete each directory in ${COPYDESTS} before we copy into it;
-## that way, we can reinstall over directories that have been put in
-## place with their files read-only (perhaps because they are checked
-## into RCS).  In order to make this safe, we make sure that the
-## source exists and is distinct from the destination.
-
-## FSF doesn't depend on `all', but rather on ${MAKE_SUBDIR}, so that
-## they "won't ever modify src/paths.h".  But that means you can't do
-## 'make install' right off the bat because src/paths.h won't exist.
-## And, in XEmacs case, src/Emacs.ad.h won't exist either.  I also
-## don't see the point in avoiding modifying paths.h.  It creates an
-## inconsistency in the build process.  So we go ahead and depend on
-## all.  --cet
-
-check-features: all
-	${blddir}/src/${PROGNAME} -batch -l check-features.el
-
-install-only: ${MAKE_SUBDIR} check-features install-arch-dep install-arch-indep
-
-install: all check-features install-arch-dep install-arch-indep
-
-install-arch-dep: mkdir
-	for subdir in ${INSTALL_ARCH_DEP_SUBDIR}; do \
-	(cd ./$${subdir} && $(RECURSIVE_MAKE) install prefix=${prefix} \
-	    exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} \
-	    archlibdir=${archlibdir}) ; done
-	if test "`(cd ${archlibdir} && $(pwd))`" != \
-		"`(cd ./lib-src && $(pwd))`"; then \
-	   if test -f ../Installation; then \
-		${INSTALL_DATA} ../Installation ${archlibdir}/Installation; \
-	   fi; \
-	   for f in DOC config.values; do \
-		${INSTALL_DATA} lib-src/$${f} ${archlibdir}/$${f}; \
-	   done ; \
-	   for subdir in `find ${archlibdir} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; \
-	     do (cd $${subdir} && $(RM) -r RCS CVS SCCS \#* *~) ; done ; \
-	else true; fi
-	${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}-${version}
-	-chmod 0755 ${bindir}/${PROGNAME}-${version}
-	cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME}
-	if test "${prefix}" != "${exec_prefix}"; then \
-	  for dir in \
-		lib/${PROGNAME} \
-	 	lib/${PROGNAME}-${version}/etc \
-		lib/${PROGNAME}-${version}/info \
-		lib/${PROGNAME}-${version}/lisp; do \
-	    if test ! -d ${exec_prefix}/$${dir}; then \
-	      $(LN_S) ${prefix}/$${dir} ${exec_prefix}/$${dir}; fi; \
-	  done; \
-	fi
-
-install-arch-indep: mkdir info
-	-@set ${COPYDESTS} ; \
-	 for dir in ${COPYDIR} ; do \
-	   if test "`(cd $$1 && $(pwd))`" != \
-		   "`(cd $${dir} && $(pwd))`"; then \
-	     : do nothing - echo "rm -rf $$1" ; \
-	   fi ; \
-	   shift ; \
-	 done
-	-set ${COPYDESTS} ; \
-	 for dir in ${COPYDESTS} ; do \
-	   if test ! -d $${dir} ; then mkdir $${dir} ; fi ; \
-	 done ; \
-	 for dir in ${COPYDIR} ; do \
-	   dest=$$1 ; shift ; \
-	   test -d $${dir} \
-	     -a "`(cd $${dir} && $(pwd))`" != \
-		"`(cd $${dest} && $(pwd))`" \
-	   && (echo "Copying $${dir}..." ; \
-	       (cd $${dir} && tar -cf - . ) | \
-		(cd $${dest} && umask 022 && tar -xf - );\
-	       chmod 0755 $${dest}; \
-	       for subdir in `find $${dest} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; do \
-		 (cd $${subdir} && $(RM) -r RCS CVS SCCS \#* *~) ; \
-	       done) ; \
-	 done
-	if test "`(cd ${srcdir}/info && $(pwd))`" != \
-		"`(cd ${infodir} && $(pwd))`" && cd ${srcdir}/info; then \
-	  if test ! -f ${infodir}/dir -a -f dir ; then \
-	    ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir ; \
-	  fi ; \
-	  for file in *.info* ; do \
-	    ${INSTALL_DATA} $${file} ${infodir}/$${file} ; \
-	    chmod 0644 ${infodir}/$${file}; \
-	  done ; \
-	fi
-	## Note it's `xemacs' not ${PROGNAME}
-	cd ${srcdir}/etc && \
-	  for page in xemacs etags ctags gnuserv gnuclient gnuattach gnudoit; do \
-	    ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \
-	    chmod 0644 ${mandir}/$${page}${manext} ; \
-	  done
-	@echo "If you would like to save approximately 2M of disk space, do"
-	@echo "make gzip-el"
-	@echo "or you may run "
-	@echo ${srcdir}/lib-src/gzip-el.sh lispdir " from the command line."
-	@echo "Where lispdir is where the lisp files were installed, i.e.,"
-	@echo "${lispdir}"
-
-gzip-el:
-	${srcdir}/lib-src/gzip-el.sh ${lispdir}
-
-MAKEPATH=./lib-src/make-path
-## Build all the directories to install XEmacs in.
-## Since we may be creating several layers of directories,
-## (e.g. /usr/local/lib/${PROGNAME}-20.5/sparc-sun-solaris2.6), we use
-## make-path instead of mkdir.  Not all mkdirs have the `-p' flag.
-mkdir: FRC.mkdir
-	${MAKEPATH} ${COPYDESTS} ${lockdir} ${infodir} ${archlibdir} \
-	  ${mandir} ${bindir} ${datadir} ${libdir} ${pkgdir}
-	-chmod 0777 ${lockdir}
-
-## Delete all the installed files that the `install' target would
-## create (but not the noninstalled files such as `make all' would
-## create).
-
-#### Don't delete the lisp and etc directories if they're in the source tree.
-#### This target has not been updated in sometime and until it is it
-#### would be extremely dangerous for anyone to use it.
-#uninstall:
-#	(cd ./lib-src; 					\
-#	 $(RECURSIVE_MAKE) uninstall			\
-#	    prefix=${prefix} exec_prefix=${exec_prefix}	\
-#	    bindir=${bindir} libdir=${libdir} archlibdir=${archlibdir})
-#	for dir in ${lispdir} ${etcdir} ; do 		\
-#	  case `(cd $${dir} ; $(pwd))` in			\
-#	    `(cd ${srcdir} ; $(pwd))`* ) ;;		\
-#	    * ) $(RM) $${dir} ;;			\
-#	  esac ;					\
-#	  case $${dir} in				\
-#	    ${datadir}/${PROGNAME}/${version}/* )		\
-#	      $(RM) -r ${datadir}/${PROGNAME}/${version}	\
-#	    ;;						\
-#	  esac ;					\
-#	done
-#	cd ${infodir} && $(RM) cl* ${PROGNAME}* forms* info* vip*
-#	cd ${mandir} && $(RM) xemacs.1 etags.1 ctags.1 gnuserv.1
-#	cd ${bindir} && $(RM) ${PROGNAME}-${version} ${PROGNAME}
-
-
-## Some makes seem to remember that they've built something called FRC,
-## so you can only use a given FRC once per makefile.
-FRC FRC.src.paths.h FRC.mkdir FRC.dump-elcs FRC.info:
-FRC.mostlyclean FRC.clean FRC.distclean FRC.realclean FRC.tags:
-
-## ==================== Cleaning up and miscellanea ====================
-
-.PHONY: mostlyclean clean distclean realclean extraclean
-
-## `mostlyclean'
-##      Like `clean', but may refrain from deleting a few files that people
-##      normally don't want to recompile.  For example, the `mostlyclean'
-##      target for GCC does not delete `libgcc.a', because recompiling it
-##      is rarely necessary and takes a lot of time.
-mostlyclean: FRC.mostlyclean
-	for d in $(SUBDIR); do (cd ./$$d && $(RECURSIVE_MAKE) $@); done
-
-## `clean'
-##      Delete all files from the current directory that are normally
-##      created by building the program.  Don't delete the files that
-##      record the configuration.  Also preserve files that could be made
-##      by building, but normally aren't because the distribution comes
-##      with them.
-
-##      Delete `.dvi' files here if they are not part of the distribution.
-clean: FRC.clean
-	for d in $(SUBDIR); do (cd ./$$d && $(RECURSIVE_MAKE) $@); done
-	$(RM) core
-
-## `distclean'
-##      Delete all files from the current directory that are created by
-##      configuring or building the program.  If you have unpacked the
-##      source and built the program without creating any other files,
-##      `make distclean' should leave only the files that were in the
-##      distribution.
-top_distclean=\
-	$(RM) config.status config.log config-tmp-* build-install Installation ; \
-	for d in src lib-src lwlib dynodump ; do \
-	  $(RM) $$d/Makefile $$d/Makefile.in ; \
-	done ; \
-	$(RM) core .sbinit Makefile lock/*; \
-	$(RM) lisp/finder-inf.el* Installation.el Installation.elc; \
-	$(RM) packages mule-packages site-lisp
-
-distclean: FRC.distclean
-	for d in $(SUBDIR); do (cd ./$$d && $(RECURSIVE_MAKE) $@); done
-	-${top_distclean}
-
-## `realclean'
-##      Delete everything from the current directory that can be
-##      reconstructed with this Makefile.  This typically includes
-##      everything deleted by distclean, plus more: C source files
-##      produced by Bison, tags tables, info files, and so on.
-
-##      One exception, however: `make realclean' should not delete
-##      `configure' even if `configure' can be remade using a rule in the
-##      Makefile.  More generally, `make realclean' should not delete
-##      anything that needs to exist in order to run `configure' and then
-##      begin to build the program.
-realclean: FRC.realclean
-	for d in $(SUBDIR); do (cd ./$$d && $(RECURSIVE_MAKE) $@); done
-	-${top_distclean}
-	$(RM) TAGS
-
-## This doesn't actually appear in the coding standards, but Karl
-## says GCC supports it, and that's where the configuration part of
-## the coding standards seem to come from.  It's like distclean, but
-## it deletes backup and autosave files too.
-extraclean:
-	for d in $(SUBDIR); do (cd ./$$d && $(RECURSIVE_MAKE) $@); done
-	$(RM) *~ \#*
-	-${top_distclean}
-
-## Unlocking and relocking.  The idea of these productions is to reduce
-## hassles when installing an incremental tar of XEmacs.  Do `make unlock'
-## before unlocking the file to take the write locks off all sources so
-## that tar xvof will overwrite them without fuss.  Then do `make relock'
-## afterward so that VC mode will know which files should be checked in
-## if you want to mung them.
-
-## Note: it's no disaster if these productions miss a file or two; tar
-## and VC will swiftly let you know if this happens, and it is easily
-## corrected.
-SOURCES = ChangeLog GETTING.GNU.SOFTWARE INSTALL Makefile.in PROBLEMS \
-	README build-install.in configure make-dist move-if-change
-
-.PHONY: unlock relock TAGS tags check dist info dvi mcs
-
-unlock:
-	chmod u+w $(SOURCES) cpp/*
-	-cd ./elisp && chmod u+w Makefile README *.texi
-	for d in src etc lib-src lisp; do (cd ./$$d && $(RECURSIVE_MAKE) $@); done
-	cd ./lisp/term && chmod u+w README *.el
-	cd ./man && chmod u+w *texi* ChangeLog split-man
-	cd ./lwlib && chmod u+w *.[ch] Makefile.in.in
-
-relock:
-	chmod u-w $(SOURCES) cpp/*
-	-cd ./elisp && chmod u-w Makefile README *.texi
-	for d in src etc lib-src lisp; do (cd ./$$d && $(RECURSIVE_MAKE) $@); done
-	cd ./lisp/term && chmod u+w README *.el
-	cd ./man && chmod u+w *texi* ChangeLog split-man
-	cd ./lwlib && chmod u+w *.[ch] Makefile.in.in
-
-PRUNE_VC = -name SCCS -prune -o -name RCS -prune -o -name CVS -prune -o
-tagslisp = lisp
-TAGS tags: FRC.tags
-	@echo "If you don't have a copy of etags around, then do 'make lib-src' first."
-	$(RM) ${srcdir}/TAGS
-	@PATH=`$(pwd)`/lib-src:$$PATH HOME=/-=-; export PATH HOME; \
-	  echo "Using etags from `which etags`."
-	PATH=`$(pwd)`/lib-src:$$PATH ; export PATH; cd ${srcdir} && \
-	find src lwlib lib-src ${PRUNE_VC} -name '*.[ch]' -print | \
-	  xargs etags -a -r '/[ 	]*DEF\(VAR\|INE\)_[A-Z_]+[ 	]*([ 	]*"\([^"]+\)"/\2/'; \
-	find ${tagslisp} ${PRUNE_VC} -name '*.el' -print | \
-	  xargs etags -a -l none -r "/^(def\\(var\\|un\\|alias\\|const\\|macro\\)[ 	]+'?\\([^ 	]+\\)/\\2/"
-
-## We have automated tests!
-testdir = ${srcdir}/tests
-tests   = ${testdir}/basic-lisp.el ${testdir}/database.el
-
-check:
-	src/${PROGNAME} -batch -l ${testdir}/test-emacs.el -f batch-test-emacs ${tests}
-
-info: FRC.info
-	cd ${srcdir}/man && $(RECURSIVE_MAKE) $@
-
-dvi:
-	cd ${srcdir}/man && $(RECURSIVE_MAKE) $@
-
-## Fix up version information in executables (Solaris-only)
-mcs:
-	date=`LANG=C LC_ALL=C date -u '+%e %b %Y'`; \
-	ident="@(#)RELEASE VERSION XEmacs ${version} $${date}"; \
-	for f in `file lib-src/* src/${PROGNAME} | grep ELF | sed -e 's/:.*//'`; do \
-	  mcs -da "$${ident} `echo $${f} | sed 's/.*\///'`" $${f}; \
-	done

File Makefile.in.in

+## DIST: This is the distribution Makefile for XEmacs.  configure can
+## DIST: make most of the changes to this file you might want, so try
+## DIST: that first.
+
+## This file is part of XEmacs.
+
+## XEmacs is free software; you can redistribute it and/or modify it
+## under the terms of the GNU General Public License as published by the
+## Free Software Foundation; either version 2, or (at your option) any
+## later version.
+
+## XEmacs is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+## FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+## for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with XEmacs; see the file COPYING.  If not, write to
+## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+## Boston, MA 02111-1307, USA.
+
+## make all	to compile and build XEmacs.
+## make install	to build and install it.
+## make install-only	to install after a previous complete build
+## make TAGS	to update tags tables.
+
+## make clean  or  make mostlyclean
+##      Delete all files from the current directory that are normally
+##      created by building the program.	 Don't delete the files that
+##      record the configuration.  Also preserve files that could be made
+##      by building, but normally aren't because the distribution comes
+##      with them.
+
+##      Delete `.dvi' files here if they are not part of the distribution.
+
+## make distclean
+##      Delete all files from the current directory that are created by
+##      configuring or building the program.  If you have unpacked the
+##      source and built the program without creating any other files,
+##      `make distclean' should leave only the files that were in the
+##      distribution.
+
+## make realclean
+##      Delete everything from the current directory that can be
+##      reconstructed with this Makefile.  This typically includes
+##      everything deleted by distclean, plus more: C source files
+##      produced by Bison, tags tables, info files, and so on.
+
+## make extraclean
+##      Still more severe - delete backup and autosave files, too.
+
+#ifdef USE_GNU_MAKE
+RECURSIVE_MAKE=$(MAKE)
+#else
+@SET_MAKE@
+RECURSIVE_MAKE=@RECURSIVE_MAKE@
+#endif
+
+SHELL = /bin/sh
+LANG = C
+RM = rm -f
+pwd = /bin/pwd
+
+## ==================== Things `configure' Might Edit ====================
+
+CC=@CC@
+CPP=@CPP@
+LN_S=@LN_S@
+CFLAGS=@CFLAGS@
+CPPFLAGS=@CPPFLAGS@
+
+## These help us choose version- and architecture-specific directories
+## to install files in.
+
+## This should be the number of the XEmacs version we're building,
+## like `19.12' or `19.13'.
+version=@version@
+
+## This should be the name of the configuration we're building XEmacs
+## for, like `mips-dec-ultrix' or `sparc-sun-sunos'.
+configuration=@configuration@
+
+## This will be the name of the generated binary and is set automatically
+## by configure.
+PROGNAME=@PROGNAME@
+
+## ==================== Where To Install Things ====================
+
+## The default location for installation.  Everything is placed in
+## subdirectories of this directory.  The default values for many of
+## the variables below are expressed in terms of this one, so you may
+## not need to change them.  This defaults to /usr/local.
+prefix=@prefix@
+
+## Like `prefix', but used for architecture-specific files.
+exec_prefix=@exec_prefix@
+
+## Where to install XEmacs and other binaries that people will want to
+## run directly (like etags).
+bindir=@bindir@
+
+## Where to install architecture-independent data files.
+## ${lispdir} and ${etcdir} are subdirectories of this.
+datadir=@datadir@
+
+## Where to find XEmacs packages.
+pkgdir=@pkgdir@
+
+## Where to install and expect the files that XEmacs modifies as it runs.
+## These files are all architecture-independent. Right now, the
+## only such data is the locking directory;
+## ${lockdir} is a subdirectory of this.
+statedir=@statedir@
+
+## Where to install and expect executable files to be run by XEmacs
+## rather than directly by users, and other architecture-dependent data
+## ${archlibdir} is a subdirectory of this.
+libdir=@libdir@
+
+## Where to install XEmacs's man pages, and what extension they should have.
+mandir=@mandir@
+manext=.1
+
+## Where to install and expect the info files describing XEmacs.  In the
+## past, this defaulted to a subdirectory of ${prefix}/lib/xemacs, but
+## since there are now many packages documented with the texinfo
+## system, it is inappropriate to imply that it is part of XEmacs.
+infodir=@infodir@
+
+## Document me.
+## See callproc.c for code which references this.
+infopath=@infopath@
+
+## Where to find the source code.  The source code for XEmacs's C kernel is
+## expected to be in ${srcdir}/src, and the source code for XEmacs's
+## utility programs is expected to be in ${srcdir}/lib-src.  This is
+## set by the configure script's `--srcdir' option.
+srcdir=@srcdir@
+
+## Where the build is done.
+blddir=@blddir@
+
+## ==================== XEmacs-specific directories ====================
+
+## These variables hold the values XEmacs will actually use.  They are
+## based on the values of the standard Make variables above.
+
+## Where to install the lisp files distributed with
+## XEmacs.  This includes the XEmacs version, so that the
+## lisp files for different versions of XEmacs will install
+## themselves in separate directories.
+lispdir=@lispdir@
+
+## Directory XEmacs should search for lisp files specific
+## to this site (i.e. customizations), before consulting
+## ${lispdir}.
+sitelispdir=@sitelispdir@
+
+## Where XEmacs will search for its lisp files while
+## building.  This is only used during the process of
+## compiling XEmacs, to help XEmacs find its lisp files
+## before they've been installed in their final location.
+## It's usually identical to lispdir, except that the
+## entry for the directory containing the installed lisp
+## files has been replaced with ../lisp.  This should be a
+## colon-separated list of directories.
+buildlispdir=${srcdir}/lisp
+
+## Where to install the other architecture-independent
+## data files distributed with XEmacs (like the tutorial,
+## the cookie recipes and the Zippy database). This path
+## usually contains the XEmacs version number, so the data
+## files for multiple versions of XEmacs may be installed
+## at once.
+etcdir=@etcdir@
+
+## Where to create and expect the locking directory, where
+## the XEmacs locking code keeps track of which files are
+## currently being edited.
+lockdir=@lockdir@
+
+## Where to put executables to be run by XEmacs rather than
+## the user.  This path usually includes the XEmacs version
+## and configuration name, so that multiple configurations
+## for multiple versions of XEmacs may be installed at
+## once.
+archlibdir=@archlibdir@
+
+## ==================== Utility Programs for the Build ====================
+
+## Allow the user to specify the install program.
+INSTALL = @install_pp@ @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+
+## ============================= Targets ==============================
+
+## Subdirectories to make recursively.  `lisp' is not included
+## because the compiled lisp files are part of the distribution
+## and you cannot remake them without installing XEmacs first.
+MAKE_SUBDIR = @MAKE_SUBDIR@
+
+## Subdirectories that can be made recursively.
+SUBDIR = ${MAKE_SUBDIR} man
+
+## The makefiles of the directories in ${MAKE_SUBDIR}.
+SUBDIR_MAKEFILES = @SUBDIR_MAKEFILES@
+
+## Subdirectories to `make install-arch-dep' recursively
+INSTALL_ARCH_DEP_SUBDIR = @INSTALL_ARCH_DEP_SUBDIR@
+
+## Subdirectories to install, and where they'll go.
+## lib-src's makefile knows how to install it, so we don't do that here.
+## When installing the info files, we need to do special things to
+## avoid nuking an existing dir file, so we don't do that here;
+## instead, we have written out explicit code in the `install' targets.
+COPYDIR = ${srcdir}/etc ${srcdir}/lisp
+COPYDESTS = ${etcdir} ${lispdir}
+GENERATED_HEADERS = src/paths.h src/Emacs.ad.h src/puresize-adjust.h src/config.h lwlib/config.h src/sheap-adjust.h
+GENERATED_LISP = lisp/finder-inf.el
+
+all: ${PROGNAME} all-elc info
+
+${PROGNAME}:	${GENERATED_HEADERS} ${MAKE_SUBDIR} ${GENERATED_LISP}
+
+## For performance and consistency, no built-in rules
+.SUFFIXES:
+
+.NO_PARALLEL:	${GENERATED_HEADERS} ${MAKE_SUBDIR} dump-elcs
+.PHONY: ${SUBDIR} all beta all-elc all-elcs dump-elc dump-elcs autoloads finder
+
+## Convenience target for XEmacs beta testers
+beta: clean all-elc finder
+
+## Convenience target for XEmacs maintainers
+## This would run `make-xemacsdist' if I were really confident that everything
+## was turnkey.
+dist: all-elc info
+
+## Convenience target for XEmacs maintainers
+## Updates some rarely generated files:
+## - configure from configure.in
+## - config.values.in from configure
+## - src/depend from src/*.[ch]
+.PHONY: config configure depend
+config: configure depend
+configure: ${srcdir}/configure
+${srcdir}/configure: ${srcdir}/configure.in
+	cd ${srcdir} && autoconf
+	cd ${srcdir} && /bin/sh lib-src/config.values.sh
+
+depend ${srcdir}/src/depend:
+	cd ${srcdir}/src && \
+		perl ./make-src-depend > depend.tmp && \
+		$(RM) depend && mv depend.tmp depend
+
+## Build XEmacs and recompile out-of-date and missing .elc files along
+## the way.
+all-elc all-elcs: lib-src lwlib dump-elcs src
+	MAKE='$(MAKE)' EMACS='./src/$(PROGNAME)' sh ${srcdir}/lib-src/update-elc.sh
+
+## Sub-target for all-elc.
+dump-elc dump-elcs: ${GENERATED_HEADERS} FRC.dump-elcs
+	cd ./src && $(RECURSIVE_MAKE) dump-elcs
+
+autoloads: src
+	MAKE='$(MAKE)' EMACS='./src/$(PROGNAME)' sh ${srcdir}/lib-src/update-autoloads.sh
+
+custom-loads:
+	MAKE='$(MAKE)' EMACS='./src/$(PROGNAME)' sh ${srcdir}/lib-src/update-custom.sh
+
+finder: src
+	@echo "Building finder database ..."
+	@(cd ./lisp; \
+		${blddir}/src/${PROGNAME} -batch -vanilla \
+		-eval '(setq finder-compile-keywords-quiet t)' \
+		-l finder -f finder-compile-keywords )
+	@echo "Building finder database ...(done)"
+
+lisp/finder-inf.el:
+	@echo "Building finder database ..."
+	@(cd ./lisp; \
+		${blddir}/src/${PROGNAME} -batch -vanilla \
+		-eval '(setq finder-compile-keywords-quiet t)' \
+		-l finder -f finder-compile-keywords )
+	@echo "Building finder database ...(done)"
+
+## We have to force the building of Emacs.ad.h as well in order to get it
+## updated correctly when VPATH is being used.  Since we use move-if-change,
+## it will only actually change if the user modified ${etcdir}/Emacs.ad.
+src/Emacs.ad.h: ${srcdir}/etc/Emacs.ad
+	@echo "Producing \`src/Emacs.ad.h' from \`etc/Emacs.ad'."
+	@$(RM) src/Emacs.ad.h
+	@(echo "/*	Do not edit this file!" ; \
+	  echo "  	Automatically generated from ${srcdir}/etc/Emacs.ad" ; \
+	  echo " */" ; \
+	  /bin/sh ${srcdir}/lib-src/ad2c ${srcdir}/etc/Emacs.ad ) > \
+	  src/Emacs.ad.h
+
+src/puresize-adjust.h:	${srcdir}/src/puresize.h
+	@echo "Resetting \`src/puresize-adjust.h'."; \
+	(echo "/*	Do not edit this file!" ; \
+	 echo "  	Automatically generated by XEmacs */" ; \
+	 echo "#define PURESIZE_ADJUSTMENT 0") > $@
+
+src/sheap-adjust.h:
+	@echo "Resetting \`src/sheap-adjust.h'."; \
+	(echo "/*	Do not edit this file!" ; \
+	 echo "  	Automatically generated by XEmacs */" ; \
+	 echo "#define SHEAP_ADJUSTMENT 0") > $@
+
+src: @SRC_SUBDIR_DEPS@ FRC.src
+pkg-src/tree-x: pkg-src/FRC.tree-x
+lib-src: FRC.lib-src
+lwlib:	FRC.lwlib
+dynodump: FRC.dynodump
+FRC.src FRC.lib-src FRC.lwlib FRC.dynodump pkg-src/FRC.tree-x:
+FRC.lisp.finder-inf.el:
+
+${SUBDIR}: ${SUBDIR_MAKEFILES} ${GENERATED_HEADERS} FRC
+	cd ./$@ && $(RECURSIVE_MAKE) all
+
+Makefile: ${srcdir}/Makefile.in config.status
+	./config.status
+
+src/Makefile: ${srcdir}/src/Makefile.in.in ${srcdir}/src/depend config.status
+	./config.status
+
+lib-src/Makefile: ${srcdir}/lib-src/Makefile.in.in config.status
+	./config.status
+
+lwlib/Makefile: ${srcdir}/lwlib/Makefile.in.in config.status
+	./config.status
+
+pkg-src/tree-x/Makefile: ${srcdir}/pkg-src/tree-x/Makefile.in.in config.status
+	./config.status
+
+src/config.h: ${srcdir}/src/config.h.in
+	./config.status && touch $@
+
+src/paths.h: ${srcdir}/src/paths.h.in
+	./config.status && touch $@
+
+lwlib/config.h: ${srcdir}/lwlib/config.h.in
+	./config.status && touch $@
+
+## ==================== Installation ====================
+
+## If we let lib-src do its own installation, that means we
+## don't have to duplicate the list of utilities to install in
+## this Makefile as well.
+
+## On AIX, use tar xBf.
+## On Xenix, use tar xpf.
+
+.PHONY: install-only install install-arch-dep install-arch-indep gzip.el mkdir
+.PHONY: check-features
+
+## We delete each directory in ${COPYDESTS} before we copy into it;
+## that way, we can reinstall over directories that have been put in
+## place with their files read-only (perhaps because they are checked
+## into RCS).  In order to make this safe, we make sure that the
+## source exists and is distinct from the destination.
+
+## FSF doesn't depend on `all', but rather on ${MAKE_SUBDIR}, so that
+## they "won't ever modify src/paths.h".  But that means you can't do
+## 'make install' right off the bat because src/paths.h won't exist.
+## And, in XEmacs case, src/Emacs.ad.h won't exist either.  I also
+## don't see the point in avoiding modifying paths.h.  It creates an
+## inconsistency in the build process.  So we go ahead and depend on
+## all.  --cet
+
+check-features: all
+	${blddir}/src/${PROGNAME} -batch -l check-features.el
+
+install-only: ${MAKE_SUBDIR} check-features install-arch-dep install-arch-indep
+
+install: all check-features install-arch-dep install-arch-indep
+
+install-arch-dep: mkdir
+	for subdir in ${INSTALL_ARCH_DEP_SUBDIR}; do \
+	(cd ./$${subdir} && $(RECURSIVE_MAKE) install prefix=${prefix} \
+	    exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} \
+	    archlibdir=${archlibdir}) ; done
+	if test "`(cd ${archlibdir} && $(pwd))`" != \
+		"`(cd ./lib-src && $(pwd))`"; then \
+	   if test -f ../Installation; then \
+		${INSTALL_DATA} ../Installation ${archlibdir}/Installation; \
+	   fi; \
+	   for f in DOC config.values; do \
+		${INSTALL_DATA} lib-src/$${f} ${archlibdir}/$${f}; \
+	   done ; \
+	   for subdir in `find ${archlibdir} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; \
+	     do (cd $${subdir} && $(RM) -r RCS CVS SCCS \#* *~) ; done ; \
+	else true; fi
+	${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}-${version}
+	-chmod 0755 ${bindir}/${PROGNAME}-${version}
+	cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME}
+	if test "${prefix}" != "${exec_prefix}"; then \
+	  for dir in \
+		lib/${PROGNAME} \
+	 	lib/${PROGNAME}-${version}/etc \
+		lib/${PROGNAME}-${version}/info \
+		lib/${PROGNAME}-${version}/lisp; do \
+	    if test ! -d ${exec_prefix}/$${dir}; then \
+	      $(LN_S) ${prefix}/$${dir} ${exec_prefix}/$${dir}; fi; \
+	  done; \
+	fi
+
+install-arch-indep: mkdir info
+	-@set ${COPYDESTS} ; \
+	 for dir in ${COPYDIR} ; do \
+	   if test "`(cd $$1 && $(pwd))`" != \
+		   "`(cd $${dir} && $(pwd))`"; then \
+	     : do nothing - echo "rm -rf $$1" ; \
+	   fi ; \
+	   shift ; \
+	 done
+	-set ${COPYDESTS} ; \
+	 for dir in ${COPYDESTS} ; do \
+	   if test ! -d $${dir} ; then mkdir $${dir} ; fi ; \
+	 done ; \
+	 for dir in ${COPYDIR} ; do \
+	   dest=$$1 ; shift ; \
+	   test -d $${dir} \
+	     -a "`(cd $${dir} && $(pwd))`" != \
+		"`(cd $${dest} && $(pwd))`" \
+	   && (echo "Copying $${dir}..." ; \
+	       (cd $${dir} && tar -cf - . ) | \
+		(cd $${dest} && umask 022 && tar -xf - );\
+	       chmod 0755 $${dest}; \
+	       for subdir in `find $${dest} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; do \
+		 (cd $${subdir} && $(RM) -r RCS CVS SCCS \#* *~) ; \
+	       done) ; \
+	 done
+	if test "`(cd ${srcdir}/info && $(pwd))`" != \
+		"`(cd ${infodir} && $(pwd))`" && cd ${srcdir}/info; then \
+	  if test ! -f ${infodir}/dir -a -f dir ; then \
+	    ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir ; \
+	  fi ; \
+	  for file in *.info* ; do \
+	    ${INSTALL_DATA} $${file} ${infodir}/$${file} ; \
+	    chmod 0644 ${infodir}/$${file}; \
+	  done ; \
+	fi
+	## Note it's `xemacs' not ${PROGNAME}
+	cd ${srcdir}/etc && \
+	  for page in xemacs etags ctags gnuserv gnuclient gnuattach gnudoit; do \
+	    ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \
+	    chmod 0644 ${mandir}/$${page}${manext} ; \
+	  done
+	@echo "If you would like to save approximately 2M of disk space, do"
+	@echo "make gzip-el"
+	@echo "or you may run "
+	@echo ${srcdir}/lib-src/gzip-el.sh lispdir " from the command line."
+	@echo "Where lispdir is where the lisp files were installed, i.e.,"
+	@echo "${lispdir}"
+
+gzip-el:
+	${srcdir}/lib-src/gzip-el.sh ${lispdir}
+
+MAKEPATH=./lib-src/make-path
+## Build all the directories to install XEmacs in.
+## Since we may be creating several layers of directories,
+## (e.g. /usr/local/lib/${PROGNAME}-20.5/sparc-sun-solaris2.6), we use
+## make-path instead of mkdir.  Not all mkdirs have the `-p' flag.
+mkdir: FRC.mkdir
+	${MAKEPATH} ${COPYDESTS} ${lockdir} ${infodir} ${archlibdir} \
+	  ${mandir} ${bindir} ${datadir} ${libdir} ${pkgdir}
+	-chmod 0777 ${lockdir}
+
+## Delete all the installed files that the `install' target would
+## create (but not the noninstalled files such as `make all' would
+## create).
+
+#### Don't delete the lisp and etc directories if they're in the source tree.
+#### This target has not been updated in sometime and until it is it
+#### would be extremely dangerous for anyone to use it.
+##uninstall:
+##	(cd ./lib-src; 					\
+##	 $(RECURSIVE_MAKE) uninstall			\
+##	    prefix=${prefix} exec_prefix=${exec_prefix}	\
+##	    bindir=${bindir} libdir=${libdir} archlibdir=${archlibdir})
+##	for dir in ${lispdir} ${etcdir} ; do 		\
+##	  case `(cd $${dir} ; $(pwd))` in			\
+##	    `(cd ${srcdir} ; $(pwd))`* ) ;;		\
+##	    * ) $(RM) $${dir} ;;			\
+##	  esac ;					\
+##	  case $${dir} in				\
+##	    ${datadir}/${PROGNAME}/${version}/* )		\
+##	      $(RM) -r ${datadir}/${PROGNAME}/${version}	\
+##	    ;;						\
+##	  esac ;					\
+##	done
+##	cd ${infodir} && $(RM) cl* ${PROGNAME}* forms* info* vip*
+##	cd ${mandir} && $(RM) xemacs.1 etags.1 ctags.1 gnuserv.1
+##	cd ${bindir} && $(RM) ${PROGNAME}-${version} ${PROGNAME}
+
+
+## Some makes seem to remember that they've built something called FRC,
+## so you can only use a given FRC once per makefile.
+FRC FRC.src.paths.h FRC.mkdir FRC.dump-elcs FRC.info:
+FRC.mostlyclean FRC.clean FRC.distclean FRC.realclean FRC.tags:
+
+## ==================== Cleaning up and miscellanea ====================
+
+.PHONY: mostlyclean clean distclean realclean extraclean
+
+## `mostlyclean'
+##      Like `clean', but may refrain from deleting a few files that people
+##      normally don't want to recompile.  For example, the `mostlyclean'
+##      target for GCC does not delete `libgcc.a', because recompiling it
+##      is rarely necessary and takes a lot of time.
+mostlyclean: FRC.mostlyclean
+	for d in $(SUBDIR); do (cd ./$$d && $(RECURSIVE_MAKE) $@); done
+
+## `clean'
+##      Delete all files from the current directory that are normally
+##      created by building the program.  Don't delete the files that
+##      record the configuration.  Also preserve files that could be made
+##      by building, but normally aren't because the distribution comes
+##      with them.
+
+##      Delete `.dvi' files here if they are not part of the distribution.
+clean: FRC.clean
+	for d in $(SUBDIR); do (cd ./$$d && $(RECURSIVE_MAKE) $@); done
+	$(RM) core
+
+## `distclean'
+##      Delete all files from the current directory that are created by
+##      configuring or building the program.  If you have unpacked the
+##      source and built the program without creating any other files,
+##      `make distclean' should leave only the files that were in the
+##      distribution.
+top_distclean=\
+	$(RM) config.status config.log config-tmp-* build-install Installation ; \
+	for d in src lib-src lwlib dynodump ; do \
+	  $(RM) $$d/Makefile $$d/Makefile.in ; \
+	done ; \
+	$(RM) core .sbinit Makefile Makefile.in lock/*; \
+	$(RM) lisp/finder-inf.el* Installation.el Installation.elc; \
+	$(RM) packages mule-packages site-lisp
+
+distclean: FRC.distclean
+	for d in $(SUBDIR); do (cd ./$$d && $(RECURSIVE_MAKE) $@); done
+	-${top_distclean}
+
+## `realclean'
+##      Delete everything from the current directory that can be
+##      reconstructed with this Makefile.  This typically includes
+##      everything deleted by distclean, plus more: C source files
+##      produced by Bison, tags tables, info files, and so on.
+
+##      One exception, however: `make realclean' should not delete
+##      `configure' even if `configure' can be remade using a rule in the
+##      Makefile.  More generally, `make realclean' should not delete
+##      anything that needs to exist in order to run `configure' and then
+##      begin to build the program.
+realclean: FRC.realclean
+	for d in $(SUBDIR); do (cd ./$$d && $(RECURSIVE_MAKE) $@); done
+	-${top_distclean}
+	$(RM) TAGS
+
+## This doesn't actually appear in the coding standards, but Karl
+## says GCC supports it, and that's where the configuration part of
+## the coding standards seem to come from.  It's like distclean, but
+## it deletes backup and autosave files too.
+extraclean:
+	for d in $(SUBDIR); do (cd ./$$d && $(RECURSIVE_MAKE) $@); done
+	$(RM) *~ \#*
+	-${top_distclean}
+
+## Unlocking and relocking.  The idea of these productions is to reduce
+## hassles when installing an incremental tar of XEmacs.  Do `make unlock'
+## before unlocking the file to take the write locks off all sources so
+## that tar xvof will overwrite them without fuss.  Then do `make relock'
+## afterward so that VC mode will know which files should be checked in
+## if you want to mung them.
+
+## Note: it's no disaster if these productions miss a file or two; tar
+## and VC will swiftly let you know if this happens, and it is easily
+## corrected.
+SOURCES = ChangeLog GETTING.GNU.SOFTWARE INSTALL Makefile.in PROBLEMS \
+	README build-install.in configure make-dist move-if-change
+
+.PHONY: unlock relock TAGS tags check dist info dvi mcs
+
+unlock:
+	chmod u+w $(SOURCES) cpp/*
+	-cd ./elisp && chmod u+w Makefile README *.texi
+	for d in src etc lib-src lisp; do (cd ./$$d && $(RECURSIVE_MAKE) $@); done
+	cd ./lisp/term && chmod u+w README *.el
+	cd ./man && chmod u+w *texi* ChangeLog split-man
+	cd ./lwlib && chmod u+w *.[ch] Makefile.in.in
+
+relock:
+	chmod u-w $(SOURCES) cpp/*
+	-cd ./elisp && chmod u-w Makefile README *.texi
+	for d in src etc lib-src lisp; do (cd ./$$d && $(RECURSIVE_MAKE) $@); done
+	cd ./lisp/term && chmod u+w README *.el
+	cd ./man && chmod u+w *texi* ChangeLog split-man
+	cd ./lwlib && chmod u+w *.[ch] Makefile.in.in
+
+PRUNE_VC = -name SCCS -prune -o -name RCS -prune -o -name CVS -prune -o
+tagslisp = lisp
+TAGS tags: FRC.tags
+	@echo "If you don't have a copy of etags around, then do 'make lib-src' first."
+	$(RM) ${srcdir}/TAGS
+	@PATH=`$(pwd)`/lib-src:$$PATH HOME=/-=-; export PATH HOME; \
+	  echo "Using etags from `which etags`."
+	PATH=`$(pwd)`/lib-src:$$PATH ; export PATH; cd ${srcdir} && \
+	find src lwlib lib-src ${PRUNE_VC} -name '*.[ch]' -print | \
+	  xargs etags -a -r '/[ 	]*DEF\(VAR\|INE\)_[A-Z_]+[ 	]*([ 	]*"\([^"]+\)"/\2/'; \
+	find ${tagslisp} ${PRUNE_VC} -name '*.el' ! -name 'auto-autoloads.el' -print | \
+	  xargs etags -a -l none -r "/^(def\\(var\\|un\\|alias\\|const\\|macro\\|subst\\|struct\\|face\\|group\\|custom\\|ine-\\(function\\|compiler-macro\\|[a-z-]+alias\\)\\)[ 	]+'?\\([^ 	]+\\)/\\3/"
+
+check:
+	cd ./src && $(RECURSIVE_MAKE) $@
+
+info: FRC.info
+	cd ${srcdir}/man && $(RECURSIVE_MAKE) $@
+
+dvi:
+	cd ${srcdir}/man && $(RECURSIVE_MAKE) $@
+
+## Fix up version information in executables (Solaris-only)
+mcs:
+	date=`LANG=C LC_ALL=C date -u '+%e %b %Y'`; \
+	ident="@(#)RELEASE VERSION XEmacs ${version} $${date}"; \
+	for f in `file lib-src/* src/${PROGNAME} | grep ELF | sed -e 's/:.*//'`; do \
+	  mcs -da "$${ident} `echo $${f} | sed 's/.*\///'`" $${f}; \
+	done

File config.guess

     amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit 0 ;;
     arc64:OpenBSD:*:*)
 	echo mips64el-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     SR2?01:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
 	exit 0;;
-    Pyramid*:OSx*:*:*|MIS*:OSx*:*:*)
+    Pyramid*:OSx*:*:*|MIS*:OSx*:*:*|MIS*:SMP_DC-OSx*:*:*)
 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
 		echo pyramid-pyramid-sysv3
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
 	exit 0 ;;
+    macppc:NetBSD:*:*)
+        echo powerpc-apple-netbsd${UNAME_RELEASE}
+        exit 0 ;;
     RISC*:Mach:*:*)
 	echo mips-dec-mach_bsd4.3
 	exit 0 ;;
 	fi
 	exit 0 ;;
     *:AIX:*:4)
-	if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
 	else
 		IBM_ARCH=powerpc
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 	echo m68k-hp-bsd4.4
 	exit 0 ;;
-    9000/[3478]??:HP-UX:*:*)
+    9000/[34678]??:HP-UX:*:*)
 	case "${UNAME_MACHINE}" in
 	    9000/31? )            HP_ARCH=m68000 ;;
 	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;;
-	    9000/8?? )            HP_ARCH=hppa1.0 ;;
+	    9000/6?? | 9000/7?? | 9000/80[24] | 9000/8?[13679] | 9000/892 )
+              sed 's/^              //' << EOF >dummy.c
+              #include <stdlib.h>
+              #include <unistd.h>
+              
+              int main ()
+              {
+              #if defined(_SC_KERNEL_BITS)
+                  long bits = sysconf(_SC_KERNEL_BITS);
+              #endif 
+                  long cpu  = sysconf (_SC_CPU_VERSION);
+              
+                  switch (cpu) 
+              	{
+              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+              	case CPU_PA_RISC2_0: 
+              #if defined(_SC_KERNEL_BITS)
+              	    switch (bits) 
+              		{
+              		case 64: puts ("hppa2.0w"); break;
+              		case 32: puts ("hppa2.0n"); break;
+              		default: puts ("hppa2.0"); break;
+              		} break;
+              #else  /* !defined(_SC_KERNEL_BITS) */
+              	    puts ("hppa2.0"); break;
+              #endif 
+              	default: puts ("hppa1.0"); break;
+              	}
+                  exit (0);
+              }
+EOF
+	${CC-cc} dummy.c -o dummy && HP_ARCH=`./dummy`
+	rm -f dummy.c dummy
 	esac
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
     hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit 0 ;;
     i?86:BSD/386:*:* | *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
 	exit 0 ;;
+    i?86:UnixWare:*:*)
+	if /bin/uname -X 2>/dev/null >/dev/null ; then
+	  (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+	    && UNAME_MACHINE=i586
+	fi
+	echo ${UNAME_MACHINE}-unixware-${UNAME_RELEASE}-${UNAME_VERSION}
+	exit 0 ;;
     pc:*:*:*)
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
         # the processor, so we play safe by assuming i386.
     news*:NEWS-OS:*:6*)
 	echo mips-sony-newsos6
 	exit 0 ;;
-    R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*)
+    R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
 	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
         exit 0 ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit 0 ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit 0 ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
 #! /bin/sh
 # Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
+#   Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
 # can handle that machine.  It does not imply ALL GNU software can.
 # Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-# Synched up with: FSF 19.31.
-
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # The goal of this file is to map all the various variations of a given
 # machine specification into a single specification in the form:
 #	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 # It is wrong to echo any other type of specification.
 
 if [ x$1 = x ]
 	;;
 esac
 
-# Separate what the user gave into CPU-COMPANY and OS (if any).
-basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-if [ $basic_machine != $1 ]
-then os=`echo $1 | sed 's/.*-/-/'`
-else os=; fi
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  linux-gnu*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
 
 ### Let's recognize common machines as not being operating systems so
 ### that things like config.sub decstation-3100 work.  We also
 		;;
 	-sco5)
 		os=sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco4)
 		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco3.2.[4-9]*)
 		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco3.2v[4-9]*)
 		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco*)
 		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-isc)
 		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-clix*)
 		basic_machine=clipper-intergraph
 		;;
 	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-lynx*)
 		os=-lynxos
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
-	tahoe | i[3-9]86 | i860 | m68k | m68000 | m88k | ns32k | arm \
-		| arme[lb] | pyramid \
-		| tron | a29k | 580 | i960 | h8300 | hppa1.0 | hppa1.1 \
-		| alpha | we32k | mab | ns16k | clipper | i370 | sh \
-		| powerpc | powerpcle | 1750a | dsp16xx | mips64 | mipsel \
-		| pdp11 | mips64el | mips64orion | mips64orionel \
-		| sparc | sparclet | sparclite | sparc64)
+	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
+		| 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 | hppa2.0 \
+		| alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
+		| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
+		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
+		| mipstx39 | mipstx39el \
+		| sparc | sparclet | sparclite | sparc64 | v850)
 		basic_machine=$basic_machine-unknown
 		;;
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i[34567]86)
+	  basic_machine=$basic_machine-pc
+	  ;;
 	# Object if more than one company name word.
 	*-*-*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
-	vax-* | tahoe-* | i[3-9]86-* | i860-* | m68k-* | m68000-* | m88k-* \
-	      | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \
-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \
-	      | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
-	      | hppa1.0-* | hppa1.1-* | alpha*-* | we32k-* | cydra-* | ns16k-* \
-	      | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
-	      | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \
-	      | mips64el-* | mips64orion-* | mips64orionel-* | mab-*)
-		;;
-	# Recognize names of some NetBSD ports.
-	amiga-* | hp300-* | mac68k-* | sun3-* | pmax-*)
+	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
+	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
+	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
+	      | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* \
+	      | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
+	      | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
+	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+	      | sparc64-* | mips64-* | mipsel-* \
+	      | mips64el-* | mips64orion-* | mips64orionel-*  \
+	      | mipstx39-* | mipstx39el-* \
+	      | f301-*)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	amiga | amiga-*)
 		basic_machine=m68k-cbm
 		;;
-	amigados)
+	amigaos | amigados)
 		basic_machine=m68k-cbm
-		os=-amigados
+		os=-amigaos
 		;;
 	amigaunix | amix)
 		basic_machine=m68k-cbm
 		basic_machine=m68k-apple
 		os=-aux
 		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
 	balance)
 		basic_machine=ns32k-sequent
 		os=-dynix
 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
 		basic_machine=hppa1.0-hp
 		;;
+	hppa-next)
+		os=-nextstep3
+		;;
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i[3-9]86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+	i[34567]86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
 		;;
-	i[3-9]86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+	i[34567]86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv4
 		;;
-	i[3-9]86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+	i[34567]86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv
 		;;
-	i[3-9]86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+	i[34567]86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-solaris2
 		;;
 	iris | iris4d)
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
+	mipsel*-linux*)
+		basic_machine=mipsel-unknown
+		os=-linux-gnu
+		;;
+	mips*-linux*)
+		basic_machine=mips-unknown
+		os=-linux-gnu
+		;;
 	mips3*-*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 		;;
 		basic_machine=m68k-tti
 		;;
         pc532 | pc532-*)
-		case $os in
-		    -netbsd*)
-			basic_machine=pc532-unknown
-			;;
-		    *)
-			basic_machine=ns32k-pc532
-			;;
-		esac
+		basic_machine=ns32k-pc532
 		;;
-	pentium | p5)
-		basic_machine=i586-intel
+	pentium | p5 | k5 | nexen)
+		basic_machine=i586-pc
 		;;
-	pentiumpro | p6)
-		basic_machine=i686-intel
+	pentiumpro | p6 | k6 | 6x86)
+		basic_machine=i686-pc
 		;;
-	pentium-* | p5-*)
+	pentiumii | pentium2)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | nexen-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumpro-* | p6-*)
+	pentiumpro-* | p6-* | k6-* | 6x86-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	k5)
-		# We don't have specific support for AMD's K5 yet, so just call it a Pentium
-		basic_machine=i586-amd
-		;;
-	nexen)
-		# We don't have specific support for Nexgen yet, so just call it a Pentium
-		basic_machine=i586-nexgen
+	pentiumii-* | pentium2-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pn)
 		basic_machine=pn-gould
 		basic_machine=i386-sequent
 		os=-dynix
 		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
 		basic_machine=vax-dec
 		os=-vms
 		;;
+	vpp*|vx|vx-*)
+               basic_machine=f301-fujitsu
+               ;;
 	vxworks960)
 		basic_machine=i960-wrs
 		os=-vxworks
 # Here we handle the default manufacturer of certain CPU types.  It is in
 # some cases the only manufacturer, in others, it is the most popular.
 	mips)
-		basic_machine=mips-mips
+		if [ x$os = x-linux-gnu ]; then
+			basic_machine=mips-unknown
+		else
+			basic_machine=mips-mips
+		fi
 		;;
 	romp)
 		basic_machine=romp-ibm
 if [ x"$os" != x"" ]
 then
 case $os in
+        # First match some system type aliases
+        # that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 	-solaris)
 		os=-solaris2
 		;;
-	-unixware* | svr4*)
+	-svr4*)
 		os=-sysv4
 		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
 	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux|'`
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
 		;;
 	# First accept the basic system types.
 	# The portable systems comes first.
 	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[345]* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigados* | -msdos* | -newsos* | -unicos* | -aof* | -aos* \
-	      | -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \
-	      | -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -freebsd* | -riscix* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -cygwin32* | -pe* | -psos* | -moss* | -openbsd* )
+	      | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -uxpv* | -beos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
 	-sunos5*)
 		os=`echo $os | sed -e 's|sunos5|solaris2|'`
 		;;
 	sparc-* | *-sun)
 		os=-sunos4.1.1
 		;;
+	*-be)
+		os=-beos