From 0372c6ddb9e0acbcb3d2552b8098dcb6066b797b Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Thu, 9 Aug 2012 02:05:04 -0500 Subject: bsdmake: ensure @PREFIX@ is always replaced with a path Signed-off-by: Jack Nagel --- Library/Formula/bsdmake.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Library/Formula') 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 -- cgit v1.2.3