summaryrefslogtreecommitdiffhomepage
path: root/doc
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2014-06-13 20:34:51 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2014-06-13 20:34:51 +0900
commit8c283e15e4d6f28bd94a4c4e0d1667dfc47e5784 (patch)
tree2aae8e9bc8b4baa3b9ccd370be3477bf979475cc /doc
parent66802d9219364f1a0e85bb214addb95e34bbd318 (diff)
downloadmruby-8c283e15e4d6f28bd94a4c4e0d1667dfc47e5784.tar.gz
mruby-8c283e15e4d6f28bd94a4c4e0d1667dfc47e5784.zip
update add_confict document; ref #2391
Diffstat (limited to 'doc')
-rw-r--r--doc/mrbgems/README.md5
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/mrbgems/README.md b/doc/mrbgems/README.md
index 7ae83ef8a..f1ae7fc4a 100644
--- a/doc/mrbgems/README.md
+++ b/doc/mrbgems/README.md
@@ -164,7 +164,6 @@ use `MRuby::Build#gem` in *build_config.rb* to override default gem.
If you have conflicting GEMs use either or both of the following methods
* `spec.add_conflict(gem, *requirements)`
* The `requirements` argument is same as in `add_dependency` method.
-* `spec.add_conflicts(*conflicting_gems)`
like following code:
@@ -173,7 +172,9 @@ like following code:
spec.author = 'John Doe'
spec.add_conflict 'mruby-onig-regexp', '> 0.0.0'
- spec.add_conflicts 'mruby-hs-regexp', 'mruby-pcre-regexp', 'mruby-regexp-pcre'
+ spec.add_conflict 'mruby-hs-regexp'
+ spec.add_conflict 'mruby-pcre-regexp'
+ spec.add_conflict 'mruby-regexp-pcre'
end
In case your GEM has more complex build requirements you can use