diff options
| author | Misty De Meo | 2012-12-27 20:09:13 -0400 |
|---|---|---|
| committer | Misty De Meo | 2012-12-27 20:26:00 -0400 |
| commit | a8301b855bb0d248d85cef5f8059479ebeca1b5e (patch) | |
| tree | e6a79fa0b8d278f06cc6ff29fc8a3db9bfce9c59 | |
| parent | 9e4df8b55b98b7335a2218d6c5ae5e99819028b7 (diff) | |
| download | homebrew-a8301b855bb0d248d85cef5f8059479ebeca1b5e.tar.bz2 | |
discount and markdown conflict with each other
| -rw-r--r-- | Library/Formula/discount.rb | 3 | ||||
| -rw-r--r-- | Library/Formula/markdown.rb | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Library/Formula/discount.rb b/Library/Formula/discount.rb index 706a09997..dd5eba8c0 100644 --- a/Library/Formula/discount.rb +++ b/Library/Formula/discount.rb @@ -5,6 +5,9 @@ class Discount < Formula url 'https://github.com/Orc/discount/tarball/v2.1.5a' sha1 '73dcf117fa6ca15332c67f246544cd224bfc1774' + conflicts_with 'markdown', + :because => 'both discount and markdown ship a `markdown` executable.' + def install system "./configure.sh", "--prefix=#{prefix}", "--mandir=#{man}", diff --git a/Library/Formula/markdown.rb b/Library/Formula/markdown.rb index 32890f67b..0c38d96f1 100644 --- a/Library/Formula/markdown.rb +++ b/Library/Formula/markdown.rb @@ -5,6 +5,9 @@ class Markdown < Formula homepage 'http://daringfireball.net/projects/markdown/' sha1 '7e6d1d9224f16fec5631bf6bc5147f1e64715a4b' + conflicts_with 'discount', + :because => 'both markdown and discount ship a `markdown` executable.' + def install bin.install 'Markdown.pl' => 'markdown' end |