From 93e4ba927c565da6c56afa6e232d7a7e4b219a44 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 17 Oct 2008 09:15:00 +0000 Subject: * configure.in (uncommon.mk): ignores failures at loading. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19819 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 +++- configure.in | 2 +- cygwin/GNUmakefile.in | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 81cf7e30d8..1fc799d947 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ -Fri Oct 17 18:07:17 2008 Nobuyoshi Nakada +Fri Oct 17 18:14:57 2008 Nobuyoshi Nakada + + * configure.in (uncommon.mk): ignores failures at loading. * test/rubygems/gemutilities.rb (RubyGemTestCase#build_rake_in): get rid of interference with other tests. diff --git a/configure.in b/configure.in index 6783b82994..10a0d31003 100644 --- a/configure.in +++ b/configure.in @@ -1897,7 +1897,7 @@ dnl ( dnl ( *yes*) echo "include Makefile" > GNUmakefile - echo "include uncommon.mk" >> GNUmakefile + echo "-include uncommon.mk" >> GNUmakefile gnumake=yes;; dnl ( *) diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in index f6883492b7..1e98a115a7 100644 --- a/cygwin/GNUmakefile.in +++ b/cygwin/GNUmakefile.in @@ -1,5 +1,5 @@ include Makefile -include uncommon.mk +-include uncommon.mk ENABLE_SHARED=@ENABLE_SHARED@ DLLWRAP = @DLLWRAP@ --target=@target_os@ -- cgit v1.2.3