mtools/multimarkdown conflict

This commit is contained in:
Adam Vandenberg 2013-11-09 22:43:35 -08:00
parent a126805ac4
commit 11ec1e80a5
2 changed files with 6 additions and 5 deletions

View file

@ -6,6 +6,8 @@ class Mtools < Formula
mirror 'http://ftp.gnu.org/gnu/mtools/mtools-4.0.17.tar.gz' mirror 'http://ftp.gnu.org/gnu/mtools/mtools-4.0.17.tar.gz'
sha1 'eebfab51148c4ab20a6aca3cea8057da5a11bdc8' sha1 'eebfab51148c4ab20a6aca3cea8057da5a11bdc8'
conflicts_with 'multimarkdown', :because => 'both install `mmd` binaries'
depends_on :x11 => :optional depends_on :x11 => :optional
def install def install

View file

@ -2,17 +2,16 @@ require 'formula'
class Multimarkdown < Formula class Multimarkdown < Formula
homepage 'http://fletcherpenney.net/multimarkdown/' homepage 'http://fletcherpenney.net/multimarkdown/'
head 'https://github.com/fletcher/MultiMarkdown-4.git', :branch => 'master'
# Use the tag instead of the tarball to get submodules # Use git tag instead of the tarball to get submodules
url 'https://github.com/fletcher/MultiMarkdown-4.git', :tag => '4.3.1' url 'https://github.com/fletcher/MultiMarkdown-4.git', :tag => '4.3.1'
head 'https://github.com/fletcher/MultiMarkdown-4.git', :branch => 'master' conflicts_with 'mtools', :because => 'both install `mmd` binaries'
def install def install
ENV.append 'CFLAGS', '-g -O3 -include GLibFacade.h' ENV.append 'CFLAGS', '-g -O3 -include GLibFacade.h'
system "make" system "make"
bin.install 'multimarkdown' bin.install 'multimarkdown', Dir['scripts/*']
bin.install Dir['scripts/*']
prefix.install 'Support' prefix.install 'Support'
end end