diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-05-13 19:48:21 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-05-13 19:48:21 +0000 |
| commit | ea8828b99ef34db70937f03adf02ab76ddd9dd7a (patch) | |
| tree | 2e0c7ceef53a14dee583cfad7c31974c32d4e15a /auto/lib/pcre/make | |
| parent | 5147f8e9cadf5f2c1b9600817cce38590d2a99db (diff) | |
| download | nginx-ea8828b99ef34db70937f03adf02ab76ddd9dd7a.tar.gz nginx-ea8828b99ef34db70937f03adf02ab76ddd9dd7a.tar.bz2 | |
switch Win32 building to modern PCRE versions (starting from 7.1)
instead of single old 4.4 version
Diffstat (limited to 'auto/lib/pcre/make')
| -rw-r--r-- | auto/lib/pcre/make | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/auto/lib/pcre/make b/auto/lib/pcre/make index 021aab9fb..9f2c658bf 100644 --- a/auto/lib/pcre/make +++ b/auto/lib/pcre/make @@ -28,19 +28,15 @@ esac case "$NGX_PLATFORM" in win32) - cp auto/lib/pcre/patch.pcre.in $PCRE - cp auto/lib/pcre/patch.pcre.in.owc $PCRE - cp auto/lib/pcre/patch.config.in $PCRE - cp auto/lib/pcre/patch.pcre.c $PCRE cat << END >> $NGX_MAKEFILE -`echo "$PCRE/pcre.h: $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"` - \$(MAKE) -f auto/lib/pcre/$ngx_makefile $ngx_pcre pcre.h - -`echo "$PCRE/pcre.lib: $PCRE/pcre.h" | sed -e "s/\//$ngx_regex_dirsep/g"` +`echo "$PCRE/pcre.lib: $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"` \$(MAKE) -f auto/lib/pcre/$ngx_makefile $ngx_pcre $ngx_opt +`echo "$PCRE/pcre.h:" | sed -e "s/\//$ngx_regex_dirsep/g"` + \$(MAKE) -f auto/lib/pcre/$ngx_makefile $ngx_pcre pcre.h + END ;; @@ -56,7 +52,6 @@ $PCRE/Makefile: $NGX_MAKEFILE && CC="\$(CC)" CFLAGS="$PCRE_OPT" \\ ./configure --disable-shared - $PCRE/.libs/libpcre.a: $PCRE/Makefile cd $PCRE \\ && \$(MAKE) libpcre.la |