diff options
| author | Jack Nagel | 2012-09-06 18:06:55 -0500 |
|---|---|---|
| committer | Jack Nagel | 2012-09-06 18:14:37 -0500 |
| commit | b11be2f1aa45e0aef6567841cfe121d5507ef859 (patch) | |
| tree | f15337ac43c86975df2d2e6af25918a9ba9ec527 /Library/Formula | |
| parent | e8111247320cf13150462be6a45aa6cd4cd79161 (diff) | |
| download | homebrew-b11be2f1aa45e0aef6567841cfe121d5507ef859.tar.bz2 | |
bsdmake: better workaround for nil X11 path
Silences an inreplace warning when X11 path exists and the fallback
replacment then fails.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/bsdmake.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Library/Formula/bsdmake.rb b/Library/Formula/bsdmake.rb index 9691c809e..c9f952831 100644 --- a/Library/Formula/bsdmake.rb +++ b/Library/Formula/bsdmake.rb @@ -22,7 +22,7 @@ class Bsdmake < Formula # 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 'mk/sys.mk', '@PREFIX@', MacOS::X11.prefix || prefix inreplace %W[mk/bsd.README mk/bsd.cpu.mk mk/bsd.doc.mk @@ -30,7 +30,6 @@ class Bsdmake < Formula mk/bsd.own.mk mk/bsd.port.mk mk/bsd.port.subdir.mk - mk/sys.mk pathnames.h], '@PREFIX@', prefix |