* src/Makefile.am (VPATH): Delimit with ":", not space.

	* src/Makefile.in: Regenerate.

	* configure.in (use of GLIBCPP_CHECK_GNU_MAKE): Don't fail if GNU
	make isn't found.
	* configure: Regenerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@42774 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 53f051a..591a689 100755 (executable)
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -2556,9 +2556,9 @@ echo "$ac_t""$_cv_gnu_make_command" 1>&6 ;
   fi
   
 
-  if test "x$_cv_gnu_make_command" = "x"; then
-    { echo "configure: error: GNU make not found. Please install it or correct your path." 1>&2; exit 1; }
-  fi
+
+
+
 
 
 

diff --git a/libstdc++-v3/configure.in b/libstdc++-v3/configure.in
index 5ad6a96..468e8df 100644 (file)
--- a/libstdc++-v3/configure.in
+++ b/libstdc++-v3/configure.in
@@ -51,9 +51,9 @@ AM_PROG_LIBTOOL
 AC_SUBST(enable_shared)
 AC_SUBST(enable_static)
 GLIBCPP_CHECK_GNU_MAKE
-  if test "x$_cv_gnu_make_command" = "x"; then
-    AC_MSG_ERROR([GNU make not found. Please install it or correct your path.])
-  fi
+
+
+
 AM_CONFIG_HEADER(config.h)
 
 # Check for c++ or library specific bits that don't require linking.

diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index 8152d71..62a72f9 100644 (file)
--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
@@ -21,7 +21,7 @@
 ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 ## USA.
 
-## $Id: Makefile.am,v 1.84 2001/04/18 01:06:04 bkoz Exp $
+## $Id: Makefile.am,v 1.85 2001/05/19 03:42:53 bkoz Exp $
 
 AUTOMAKE_OPTIONS = 1.3 gnits
 MAINT_CHARSET = latin1
@@ -173,9 +173,7 @@ sources = \
        string-inst.cc wstring-inst.cc 
 
 
-VPATH += $(top_srcdir) $(top_srcdir)/src
-VPATH += $(GLIBCPP_INCLUDE_DIR) 
-VPATH += $(GLIBCPP_INCLUDE_DIR)/std $(C_INCLUDE_DIR)
+VPATH = $(top_srcdir):$(top_srcdir)/src:$(GLIBCPP_INCLUDE_DIR):$(GLIBCPP_INCLUDE_DIR)/std:$(C_INCLUDE_DIR)
 
 libstdc___la_SOURCES = $(sources)
 

diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index 972d809..b0d9bf0 100644 (file)
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -167,7 +167,7 @@ build_headers =     bits/std_limits.h       bits/c++config.h bits/c++io.h bits/c++local
 
 sources =      limitsMEMBERS.cc        stdexcept.cc functexcept.cc bitset.cc   globals.cc      basic_file.cc ios.cc complex_io.cc strstream.cc         c++locale.cc locale.cc localename.cc codecvt.cc         locale-inst.cc stl-inst.cc misc-inst.cc valarray-inst.cc        string-inst.cc wstring-inst.cc 
 
-VPATH =  $(top_srcdir) $(top_srcdir)/src $(GLIBCPP_INCLUDE_DIR)  $(GLIBCPP_INCLUDE_DIR)/std $(C_INCLUDE_DIR)
+VPATH =  $(top_srcdir):$(top_srcdir)/src:$(GLIBCPP_INCLUDE_DIR):$(GLIBCPP_INCLUDE_DIR)/std:$(C_INCLUDE_DIR)
 
 libstdc___la_SOURCES = $(sources)