Mercurial > hg > nginx
comparison auto/lib/pcre/make @ 2838:ecdc41bf2047
backout r2833: CURDIR was set to Unix style path
instead, do chdir inside Makefile
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 12 May 2009 13:15:43 +0000 |
parents | d27ac70df098 |
children | 22c4c012c8c9 |
comparison
equal
deleted
inserted
replaced
2837:c670227c485a | 2838:ecdc41bf2047 |
---|---|
5 case "$NGX_CC_NAME" in | 5 case "$NGX_CC_NAME" in |
6 | 6 |
7 msvc*) | 7 msvc*) |
8 ngx_makefile=makefile.msvc | 8 ngx_makefile=makefile.msvc |
9 ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC" | 9 ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC" |
10 ngx_pcre="PCRE=\"$PCRE\"" | |
10 ;; | 11 ;; |
11 | 12 |
12 owc*) | 13 owc*) |
13 ngx_makefile=makefile.owc | 14 ngx_makefile=makefile.owc |
14 ngx_opt="CPU_OPT=\"$CPU_OPT\"" | 15 ngx_opt="CPU_OPT=\"$CPU_OPT\"" |
16 ngx_pcre=`echo PCRE=\"$PCRE\" | sed -e "s/\//$ngx_regex_dirsep/g"` | |
15 ;; | 17 ;; |
16 | 18 |
17 bcc) | 19 bcc) |
18 ngx_makefile=makefile.bcc | 20 ngx_makefile=makefile.bcc |
19 ngx_opt="-DCPU_OPT=\"$CPU_OPT\"" | 21 ngx_opt="-DCPU_OPT=\"$CPU_OPT\"" |
22 ngx_pcre=`echo \-DPCRE=\"$PCRE\" | sed -e "s/\//$ngx_regex_dirsep/g"` | |
20 ;; | 23 ;; |
21 | 24 |
22 esac | 25 esac |
23 | 26 |
24 | 27 |
27 win32) | 30 win32) |
28 cp auto/lib/pcre/patch.pcre.in $PCRE | 31 cp auto/lib/pcre/patch.pcre.in $PCRE |
29 cp auto/lib/pcre/patch.pcre.in.owc $PCRE | 32 cp auto/lib/pcre/patch.pcre.in.owc $PCRE |
30 cp auto/lib/pcre/patch.config.in $PCRE | 33 cp auto/lib/pcre/patch.config.in $PCRE |
31 cp auto/lib/pcre/patch.pcre.c $PCRE | 34 cp auto/lib/pcre/patch.pcre.c $PCRE |
32 cp auto/lib/pcre/$ngx_makefile $PCRE | |
33 | |
34 ngx_pcre=`echo $PCRE | sed -e "s/\//$ngx_regex_dirsep/g"` | |
35 | 35 |
36 cat << END >> $NGX_MAKEFILE | 36 cat << END >> $NGX_MAKEFILE |
37 | 37 |
38 `echo "$PCRE/pcre.h: $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"` | 38 `echo "$PCRE/pcre.h: $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"` |
39 cd $ngx_pcre | 39 \$(MAKE) -f auto/lib/pcre/$ngx_makefile $ngx_pcre pcre.h |
40 \$(MAKE) -f $ngx_makefile pcre.h | |
41 cd \$(CURDIR) | |
42 | 40 |
43 `echo "$PCRE/pcre.lib: $PCRE/pcre.h" | sed -e "s/\//$ngx_regex_dirsep/g"` | 41 `echo "$PCRE/pcre.lib: $PCRE/pcre.h" | sed -e "s/\//$ngx_regex_dirsep/g"` |
44 cd $ngx_pcre | 42 \$(MAKE) -f auto/lib/pcre/$ngx_makefile $ngx_pcre $ngx_opt |
45 \$(MAKE) -f $ngx_makefile $ngx_opt | |
46 cd \$(CURDIR) | |
47 | 43 |
48 END | 44 END |
49 | 45 |
50 ;; | 46 ;; |
51 | 47 |