diff options
| author | Jack Nagel | 2012-08-09 02:05:04 -0500 |
|---|---|---|
| committer | Jack Nagel | 2012-08-10 00:03:21 -0500 |
| commit | 0372c6ddb9e0acbcb3d2552b8098dcb6066b797b (patch) | |
| tree | 20a9ed5b6a8dada3877f2c8c57152a6254905b65 /Library/Formula/bsdmake.rb | |
| parent | 73b62d0206cd0de52049bf9c661cc64fb3ae7c08 (diff) | |
| download | homebrew-0372c6ddb9e0acbcb3d2552b8098dcb6066b797b.tar.bz2 | |
bsdmake: ensure @PREFIX@ is always replaced with a path
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Formula/bsdmake.rb')
| -rw-r--r-- | Library/Formula/bsdmake.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Library/Formula/bsdmake.rb b/Library/Formula/bsdmake.rb index 3021d4fc8..199d97ab1 100644 --- a/Library/Formula/bsdmake.rb +++ b/Library/Formula/bsdmake.rb @@ -21,6 +21,8 @@ class Bsdmake < Formula def install # Replace @PREFIX@ inserted by MacPorts patches # Use 'prefix' since this is sometimes a keg-only brew + # But first replace the X11 path if X11 is installed + inreplace 'mk/sys.mk', '@PREFIX@', MacOS::X11.prefix if MacOS::X11.installed? inreplace %W[mk/bsd.README mk/bsd.cpu.mk mk/bsd.doc.mk @@ -28,12 +30,10 @@ class Bsdmake < Formula mk/bsd.own.mk mk/bsd.port.mk mk/bsd.port.subdir.mk + mk/sys.mk pathnames.h], '@PREFIX@', prefix - # X11 path shouldn't be munged - inreplace 'mk/sys.mk', '@PREFIX@', MacOS::X11.prefix if MacOS::X11.installed? - inreplace 'mk/bsd.own.mk' do |s| s.gsub! '@INSTALL_USER@', `id -un`.chomp s.gsub! '@INSTALL_GROUP@', `id -gn`.chomp |