diff options
| -rw-r--r-- | Library/Formula/ddclient.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/dmd.rb | 8 | ||||
| -rw-r--r-- | Library/Formula/fftw.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/libspotify.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/mad.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/platypus.rb | 4 | ||||
| -rwxr-xr-x | bin/brew | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/Library/Formula/ddclient.rb b/Library/Formula/ddclient.rb index 9c3fcee0e..cd96cab8b 100644 --- a/Library/Formula/ddclient.rb +++ b/Library/Formula/ddclient.rb @@ -29,7 +29,7 @@ class Ddclient <Formula inreplace 'sample-etc_ddclient.conf' do |s| s.gsub! "/var/run/ddclient.pid", (var + 'run/ddclient/pid') end - (share + 'doc' + 'ddclient').install ['sample-ddclient-wrapper.sh',\ + (share + 'doc/ddclient').install ['sample-ddclient-wrapper.sh',\ 'sample-etc_cron.d_ddclient',\ 'sample-etc_ddclient.conf'] diff --git a/Library/Formula/dmd.rb b/Library/Formula/dmd.rb index 55cd6c3b1..164877f4a 100644 --- a/Library/Formula/dmd.rb +++ b/Library/Formula/dmd.rb @@ -7,7 +7,7 @@ class Dmd <Formula def doc #use d and not dmd, rationale: meh - prefix+'share'+'doc'+'d' + prefix+'share/doc/d' end def install @@ -24,11 +24,11 @@ class Dmd <Formula prefix.install 'src' man.install 'man/man1' - (prefix+'src'+'dmd').rmtree # we don't need the dmd sources thanks + (prefix+'src/dmd').rmtree # we don't need the dmd sources thanks (man+'man5').install man1+'dmd.conf.5' # oops - (prefix+'share'+'d'+'examples').install Dir['samples/d/*.d'] + (prefix+'share/d/examples').install Dir['samples/d/*.d'] - (prefix+'bin'+'dmd.conf').open('w') do |f| + (prefix+'bin/dmd.conf').open('w') do |f| f.puts "[Environment]" f.puts "DFLAGS=-I#{prefix}/src/phobos -L-L#{prefix}/lib" end diff --git a/Library/Formula/fftw.rb b/Library/Formula/fftw.rb index ce9df6bed..9e3074341 100644 --- a/Library/Formula/fftw.rb +++ b/Library/Formula/fftw.rb @@ -49,6 +49,6 @@ class Fftw <Formula system "make install" #wtf file? - (prefix+'share'+'info'+'dir').unlink + (prefix+'share/info/dir').unlink end end diff --git a/Library/Formula/libspotify.rb b/Library/Formula/libspotify.rb index e8bf58d13..6d3782bf4 100644 --- a/Library/Formula/libspotify.rb +++ b/Library/Formula/libspotify.rb @@ -10,7 +10,7 @@ class Libspotify <Formula include + 'libspotify' end def pc - lib+'pkgconfig'+'libspotify.pc' + lib+'pkgconfig/libspotify.pc' end def install diff --git a/Library/Formula/mad.rb b/Library/Formula/mad.rb index a1d1f7e17..bdc731295 100644 --- a/Library/Formula/mad.rb +++ b/Library/Formula/mad.rb @@ -28,6 +28,6 @@ Cflags: -I${includedir} system "./configure --disable-debugging --enable-fpm=intel --prefix='#{prefix}'" system "make install" - (lib+'pkgconfig'+'mad.pc').write mad_pc + (lib+'pkgconfig/mad.pc').write mad_pc end end
\ No newline at end of file diff --git a/Library/Formula/platypus.rb b/Library/Formula/platypus.rb index 57f239b84..33844d3a7 100644 --- a/Library/Formula/platypus.rb +++ b/Library/Formula/platypus.rb @@ -35,13 +35,13 @@ class Platypus <Formula # Install sub-binary parts to share Dir.chdir('Script_Exec/build/Release/ScriptExec.app/Contents') do (share + 'platypus').install "MacOS/ScriptExec" - (share + 'platypus' + 'MainMenu.nib').install "Resources/English.lproj/MainMenu.nib/keyedobjects.nib" + (share + 'platypus/MainMenu.nib').install "Resources/English.lproj/MainMenu.nib/keyedobjects.nib" end # Install icons to share (share + 'platypus').install 'Icons/PlatypusDefault.icns' # Write version info to share - (share + 'platypus' + 'Version').write version + (share + 'platypus/Version').write version end end @@ -8,7 +8,7 @@ Dir.getwd rescue abort "The current working directory doesn't exist, cannot proc HOMEBREW_BREW_FILE = ENV['HOMEBREW_BREW_FILE'] = File.expand_path(__FILE__) require 'pathname' -HOMEBREW_LIBRARY_PATH = (Pathname.new(__FILE__).realpath.dirname.parent+"Library"+"Homebrew").to_s +HOMEBREW_LIBRARY_PATH = (Pathname.new(__FILE__).realpath.dirname.parent+"Library/Homebrew").to_s $:.unshift(HOMEBREW_LIBRARY_PATH) require 'global' |