configure: Revert in-srcdir redirect upon request.

2002-06-24  Phil Edwards  <pme@gcc.gnu.org>

	* configure:  Revert in-srcdir redirect upon request.
	* .cvsignore:  Add Makefile.
	* Makefile:  Removed.

From-SVN: r54954

diff --git a/.cvsignore b/.cvsignore
index 9cd799e739ae2d271ddf1e3217840fe8715a710b..2852f92c40d05bb117e6cbe68cf62839f58920bb 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -25,6 +25,7 @@ configure.tp
 configure.tps
 configure.vr
 configure.vrs
+Makefile
 dir.info
 lost+found
 update.out

diff --git a/ChangeLog b/ChangeLog
index 3712c12d135f718ca4f16113416a1143f08217cb..0bdf760cd215ac74f6fe31aee3866a1383b6b464 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-24  Phil Edwards  <pme@gcc.gnu.org>
+
+       * configure:  Revert in-srcdir redirect upon request.
+       * .cvsignore:  Add Makefile.
+       * Makefile:  Removed.
+
 2002-06-18  Phil Edwards  <pme@gcc.gnu.org>
 
        * configure:  Remove garbage from previous commit.

diff --git a/Makefile b/Makefile
deleted file mode 100644 (file)
index ff81fa5..0000000
--- a/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Redirecting Makefile.
-#   Copyright (C) 2002 Free Software Foundation
-#
-# This file 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 of the License, or
-# (at your option) any later version.
-# 
-# This program 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 this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-
-# This Makefile is a red herring.  It is not normally used and it is never
-# written by 'configure' from 'Makefile.in'.  This Makefile is here to
-# support users who try to configure/build in the source directory.  It
-# simply chdir's into a subdirectory created by configure and reinvokes
-# make.  Few targets are listed because advanced users (who would use those
-# targets) are assumed to know that a separate build dir is recommended.
-
-SHELL = /bin/sh
-
-# Additional pass-through targets can be listed here.
-TARGETS=bootstrap \
-        clean \
-        install
-
-all:
-.PHONY: sanitycheck
-
-distclean:
-       test -f s-buildd || exit 0 &&  \
-         . ./s-buildd && rm -rf $${builddir} s-buildd
-
-sanitycheck:
-       @if test ! -f s-buildd; then  \
-         echo 'You must configure before attempting to build.';  \
-         echo 'Please read the instructions in the INSTALL directory.';  \
-         exit 1;  \
-       fi
-
-$(TARGETS): sanitycheck
-       (. ./s-buildd; cd $${builddir}; ${MAKE} $@)
-
-all: sanitycheck
-       (. ./s-buildd; cd $${builddir}; ${MAKE} $${defaulttarget})
-

diff --git a/configure b/configure
index bd3bb7995b89bce21d7a58a1f6290380d823fb20..e551700ca3b37d06ea2e08958fb9c3d297f39e73 100755 (executable)
--- a/configure
+++ b/configure
@@ -89,7 +89,7 @@ subdirs=
 target_alias=NOTARGET
 target_makefile_frag=
 undefs=NOUNDEFS
-version="$Revision: 1.40.6.1 $"
+version="$Revision: 1.40.6.2 $"
 x11=default
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
@@ -573,33 +573,6 @@ case "${srcdir}" in
        fi
 esac
 
-# If it's an in-source build, make a directory and configure there instead.
-# Name the build directory after the host for clarity's sake.  Remember that
-# name for the redirecting makefile's use, since the makefile shouldn't have
-# to duplicate the work of figuring out host_alias.
-#
-# Also remember if this is a native build or not.  Variations on "or not"
-# are performed later in this script so we can't test them here.  In
-# particular, build_alias will still be empty unless specified by the user,
-# so do not try in-source builds when making a host-x-host compiler.
-# For a cross compile, "make all" = "all".  Otherwise, "all" = "bootstrap".
-if test "${srcdir}" = "." ; then
-       builddir=${host_alias}
-       if test ! -d ${builddir}; then
-               mkdir ${builddir} || exit 1
-       fi
-       if test ${host_alias} != ${target_alias}; then
-               t=all
-       else
-               t=bootstrap
-       fi
-       # stamp-builddir is too long for #$&!*@ 8.3 filesystems
-       echo "builddir=${builddir}" > s-buildd
-       echo "defaulttarget=$t" >> s-buildd
-       cd ${builddir}
-       exec ${config_shell} ../configure $arguments
-fi
-
 ### warn about some conflicting configurations.
 
 case "${srcdir}" in