diff options
| author | Stefan | 2014-01-24 11:20:56 +0100 |
|---|---|---|
| committer | Adam Vandenberg | 2014-02-06 18:49:19 -0800 |
| commit | 858af4026bb01be93404e5aa31654c504eec8d9c (patch) | |
| tree | a289ccdb878dc877d17bdc805c968b1336783249 /Library | |
| parent | efeed55f1312fa684b53ad56e9ac60985315aeb5 (diff) | |
| download | homebrew-858af4026bb01be93404e5aa31654c504eec8d9c.tar.bz2 | |
irods: link osxfuse and use :optional DSL
Closes #26086.
Closes #26141.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Formula/irods.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Library/Formula/irods.rb b/Library/Formula/irods.rb index 3a0c601c2..72938d8b1 100644 --- a/Library/Formula/irods.rb +++ b/Library/Formula/irods.rb @@ -7,9 +7,9 @@ class Irods < Formula conflicts_with 'sleuthkit', :because => 'both install `ils`' - option 'with-fuse', 'Install iRODS FUSE client' + option 'with-osxfuse', 'Install iRODS FUSE client' - depends_on 'osxfuse' if build.include? 'with-fuse' + depends_on 'osxfuse' => :optional def install chdir 'iRODS' @@ -23,12 +23,13 @@ class Irods < Formula bin.install Dir['clients/icommands/bin/*'].select {|f| File.executable? f} - # patch in order to use fuse4x - if build.include? 'with-fuse' + # patch in order to use osxfuse + if build.with? 'osxfuse' inreplace 'config/config.mk', '# IRODS_FS = 1', 'IRODS_FS = 1' inreplace 'config/config.mk', 'fuseHomeDir=/home/mwan/adil/fuse-2.7.0', "fuseHomeDir=#{HOMEBREW_PREFIX}" chdir 'clients/fuse' do - inreplace 'Makefile', 'lfuse', 'lfuse4x' + inreplace 'Makefile', 'lfuse', 'losxfuse' + inreplace 'Makefile', '-I$(fuseHomeDir)/include', '-I$(fuseHomeDir)/include/osxfuse' system 'make' end bin.install Dir['clients/fuse/bin/*'].select {|f| File.executable? f} |
