diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-17 09:15:00 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-17 09:15:00 +0000 |
| commit | e8371d8b4423fb4d7731c8a10320a17128c68c08 (patch) | |
| tree | 842ac1261489e1727da47d251f35a5455d5f67f4 | |
| parent | bba37fc0c0185a64456a161a5bd127ecdbc137b8 (diff) | |
* configure.in (uncommon.mk): ignores failures at loading.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19819 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | cygwin/GNUmakefile.in | 2 |
3 files changed, 5 insertions, 3 deletions
@@ -1,4 +1,6 @@ -Fri Oct 17 18:07:17 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> +Fri Oct 17 18:14:57 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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 6783b8299..10a0d3100 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 f6883492b..1e98a115a 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@ |