diff options
| author | Hans-Peter Nilsson <hp@gcc.gnu.org> | 2001-06-01 09:22:05 +0000 |
|---|---|---|
| committer | Hans-Peter Nilsson <hp@gcc.gnu.org> | 2001-06-01 09:22:05 +0000 |
| commit | 04e7878615fb559515456c58a8e043b55e63ddd2 (patch) | |
| tree | db591365db7f9afc24f9b156266bcf6a654b8651 | |
| parent | db3f0336965e44d7661f9d1c15cfc50a5fd97f50 (diff) | |
| download | gcc-04e7878615fb559515456c58a8e043b55e63ddd2.zip gcc-04e7878615fb559515456c58a8e043b55e63ddd2.tar.gz gcc-04e7878615fb559515456c58a8e043b55e63ddd2.tar.bz2 | |
Makefile.am (VPATH): Delimit with ":", not space.
* 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.
From-SVN: r42774
| -rwxr-xr-x | libstdc++-v3/configure | 6 | ||||
| -rw-r--r-- | libstdc++-v3/configure.in | 6 | ||||
| -rw-r--r-- | libstdc++-v3/src/Makefile.am | 6 | ||||
| -rw-r--r-- | libstdc++-v3/src/Makefile.in | 2 |
4 files changed, 9 insertions, 11 deletions
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 53f051a..591a689 100755 --- 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 --- 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 --- 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 --- 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) |