Search for pcre also in HOMEBREW_PREFIX
Fixes installing nginx when Homebrew is not in /usr/local Closes Homebrew/homebrew#76master
parent
339d725628
commit
bdfd9a138c
|
@ -6,7 +6,11 @@ class Nginx < Formula
|
||||||
@md5='ab22f1b7f098a90d803a3abb94d23f7e'
|
@md5='ab22f1b7f098a90d803a3abb94d23f7e'
|
||||||
|
|
||||||
depends_on 'pcre'
|
depends_on 'pcre'
|
||||||
|
|
||||||
|
def patches
|
||||||
|
DATA
|
||||||
|
end
|
||||||
|
|
||||||
def options
|
def options
|
||||||
[
|
[
|
||||||
['--with-passenger', "Compile with support for Phusion Passenger module"]
|
['--with-passenger', "Compile with support for Phusion Passenger module"]
|
||||||
|
@ -36,3 +40,31 @@ class Nginx < Formula
|
||||||
system "make install"
|
system "make install"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
__END__
|
||||||
|
--- a/auto/lib/pcre/conf
|
||||||
|
+++ b/auto/lib/pcre/conf
|
||||||
|
@@ -155,6 +155,22 @@ 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"
|
||||||
|
+
|
||||||
|
+ if [ $NGX_RPATH = YES ]; then
|
||||||
|
+ ngx_feature_libs="-R#{HOMEBREW_PREFIX}/lib -L#{HOMEBREW_PREFIX}/lib -lpcre"
|
||||||
|
+ else
|
||||||
|
+ ngx_feature_libs="-L#{HOMEBREW_PREFIX}/lib -lpcre"
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ . auto/feature
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
if [ $ngx_found = yes ]; then
|
||||||
|
CORE_DEPS="$CORE_DEPS $REGEX_DEPS"
|
||||||
|
CORE_SRCS="$CORE_SRCS $REGEX_SRCS"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue