aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula
diff options
context:
space:
mode:
Diffstat (limited to 'Library/Formula')
-rw-r--r--Library/Formula/bsdmake.rb6
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