Search for pcre also in HOMEBREW_PREFIX
Fixes installing nginx when Homebrew is not in /usr/local Closes Homebrew/homebrew#76
This commit is contained in:
parent
339d725628
commit
bdfd9a138c
1 changed files with 33 additions and 1 deletions
|
@ -7,6 +7,10 @@ class Nginx < Formula
|
|||
|
||||
depends_on 'pcre'
|
||||
|
||||
def patches
|
||||
DATA
|
||||
end
|
||||
|
||||
def options
|
||||
[
|
||||
['--with-passenger', "Compile with support for Phusion Passenger module"]
|
||||
|
@ -36,3 +40,31 @@ class Nginx < Formula
|
|||
system "make install"
|
||||
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 a new issue