Mercurial > hg > nginx-vendor-current

diff auto/init @ 4:4b2dafa26fe2 NGINX_0_1_2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.1.2 *) Feature: the --user=USER, --group=GROUP, and --with-ld-opt=OPTIONS options in configure. *) Feature: the server_name directive supports *.domain.tld. *) Bugfix: the portability improvements. *) Bugfix: if configuration file was set in command line, the reconfiguration was impossible; bug appeared in 0.1.1. *) Bugfix: proxy module may get caught in an endless loop when sendfile is not used. *) Bugfix: with sendfile the response was not recoded according to the charset module directives; bug appeared in 0.1.1. *) Bugfix: very seldom bug in the kqueue processing. *) Bugfix: the gzip module compressed the proxied responses that was already compressed.
author Igor Sysoev <http://sysoev.ru>
date Thu, 21 Oct 2004 00:00:00 +0400
parents cc9f381affaa
children 6f8b0dc0f8dd
line wrap: on
line diff
--- a/auto/init
+++ b/auto/init
@@ -2,31 +2,33 @@
 # Copyright (C) Igor Sysoev
 
 
+NGX_MAKEFILE=$NGX_OBJS/Makefile
+NGX_MODULES_C=$NGX_OBJS/ngx_modules.c
+
+NGX_AUTO_HEADERS_H=$NGX_OBJS/ngx_auto_headers.h
+NGX_AUTO_CONFIG_H=$NGX_OBJS/ngx_auto_config.h
+
+NGX_AUTOTEST=$NGX_OBJS/autotest
+NGX_AUTOCONF_ERR=$NGX_OBJS/autoconf.err
+
+# STUBs
+OBJS=$NGX_OBJS
+NGX_ERR=$OBJS/autoconf.err
 MAKEFILE=$OBJS/Makefile
 
-NGX_AUTO_CONFIG_H=$OBJS/ngx_auto_config.h
-NGX_MODULES_C=$OBJS/ngx_modules.c
 
-NGX_AUTOTEST=$OBJS/autotest
-NGX_ERR=$OBJS/autoconf.err
-
-CC_WARN=$CC
-
-PCH=NO
-USEPCH=
-
-OBJEXT=
-BINEXT=
-DIRSEP='\/'
-MAKE_SL=NO
+NGX_PCH=
+NGX_USE_PCH=
 
 
-# checking echo's "-n" option and "\c" capabilties
+# check the echo's "-n" option and "\c" capability
 
 if echo "test\c" | grep c >/dev/null; then
+
     if echo -n test | grep n >/dev/null; then
         ngx_n=
         ngx_c=
+
     else
         ngx_n=-n
         ngx_c=
@@ -38,19 +40,18 @@ else
 fi
 
 
+# create Makefile
 
-if test ! -f Makefile; then
-
-    cat << END > Makefile
+cat << END > Makefile
 
 build:
-	\$(MAKE) -f $OBJS/Makefile
+	\$(MAKE) -f $NGX_MAKEFILE
 
 install:
-	\$(MAKE) -f $OBJS/Makefile install
+	\$(MAKE) -f $NGX_MAKEFILE install
 
 clean:
-	rm -rf Makefile $OBJS
+	rm -rf Makefile $NGX_OBJS
 
 upgrade:
 	$SBIN_PATH -t
@@ -58,7 +59,4 @@ upgrade:
 	sleep 1
 	test -f $PID_PATH.newbin
 	kill -WINCH \`cat $PID_PATH\`
-
 END
-
-fi