aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorCorey Donohoe2011-09-19 14:00:41 -0700
committerJack Nagel2011-09-19 16:23:25 -0500
commit05209f7c75f693edf23d992b5a00409520d36de2 (patch)
tree76d2ad173bc1b072d7baf60092afe97d0d376fac /Library
parent84e01a41055781ad964b476d9a234f1e3f919db7 (diff)
downloadhomebrew-05209f7c75f693edf23d992b5a00409520d36de2.tar.bz2
nginx: fix patch variable substitution
Closes #7718. Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library')
-rw-r--r--Library/Formula/nginx.rb11
1 files changed, 5 insertions, 6 deletions
diff --git a/Library/Formula/nginx.rb b/Library/Formula/nginx.rb
index 055068ec6..55ffd43ed 100644
--- a/Library/Formula/nginx.rb
+++ b/Library/Formula/nginx.rb
@@ -108,21 +108,20 @@ end
__END__
--- a/auto/lib/pcre/conf
+++ b/auto/lib/pcre/conf
-@@ -155,6 +155,22 @@ else
+@@ -155,6 +155,21 @@ else
. auto/feature
fi
+ if [ $ngx_found = no ]; then
+
+ # Homebrew
-+ HOMEBREW_PREFIX=${NGX_PREFIX%Cellar*}
-+ ngx_feature="PCRE library in ${HOMEBREW_PREFIX}"
-+ ngx_feature_path="${HOMEBREW_PREFIX}/include"
++ ngx_feature="PCRE library in HOMEBREW_PREFIX"
++ ngx_feature_path="HOMEBREW_PREFIX/include"
+
+ if [ $NGX_RPATH = YES ]; then
-+ ngx_feature_libs="-R${HOMEBREW_PREFIX}/lib -L${HOMEBREW_PREFIX}/lib -lpcre"
++ ngx_feature_libs="-RHOMEBREW_PREFIX/lib -LHOMEBREW_PREFIX/lib -lpcre"
+ else
-+ ngx_feature_libs="-L${HOMEBREW_PREFIX}/lib -lpcre"
++ ngx_feature_libs="-LHOMEBREW_PREFIX/lib -lpcre"
+ fi
+
+ . auto/feature