nginx-0.1.0-2004-09-27-20:03:21 import
diff --git a/auto/configure b/auto/configure
index c10ee68..dba10b3 100755
--- a/auto/configure
+++ b/auto/configure
@@ -31,6 +31,7 @@
. auto/make
. auto/lib/make
+. auto/install
if [ "$PLATFORM" != win32 ]; then
. auto/unix
diff --git a/auto/install b/auto/install
new file mode 100644
index 0000000..1ecf5a7
--- /dev/null
+++ b/auto/install
@@ -0,0 +1,45 @@
+
+cat << END >> $MAKEFILE
+install:
+ test -d $PREFIX || mkdir -p $PREFIX
+
+ test -d `dirname $SBIN_PATH` || mkdir -p `dirname $SBIN_PATH`
+ cp nginx $SBIN_PATH
+
+ test -d `dirname $CONF_PATH` || mkdir -p `dirname $CONF_PATH`
+
+ cp conf/koi-win `dirname $CONF_PATH`
+
+ test -f `dirname $CONF_PATH`/mime.types || \
+ cp conf/mime.types `dirname $CONF_PATH`/mime.types
+ cp conf/mime.types `dirname $CONF_PATH`/mime.types.default
+
+ test -f $CONF_PATH || cp conf/nginx.conf $CONF_PATH
+ cp conf/nginx.conf `dirname $CONF_PATH`/nginx.conf.default
+
+ test -d `dirname $PID_PATH` || mkdir -p `dirname $PID_PATH`
+ test -d `dirname $ERROR_LOG_PATH` || mkdir -p `dirname $ERROR_LOG_PATH`
+ test -d `dirname $HTTP_LOG_PATH` || mkdir -p `dirname $HTTP_LOG_PATH`
+
+ test -d $PREFIX/html || cp -r html $PREFIX
+
+ #test -d $PREFIX/temp || mkdir -p $PREFIX/temp
+END
+
+
+if test ! -f Makefile; then
+
+ cat << END > Makefile
+
+build:
+ \$(MAKE) -f $OBJS/Makefile
+
+install:
+ \$(MAKE) -f $OBJS/Makefile install
+
+clean:
+ rm -rf Makefile $OBJS
+
+END
+
+fi
diff --git a/auto/options b/auto/options
index 132c35d..4276105 100644
--- a/auto/options
+++ b/auto/options
@@ -33,10 +33,10 @@
HTTP_CHARSET=YES
HTTP_GZIP=YES
HTTP_SSL=NO
-HTTP_SSI=YES
+HTTP_SSI=NO
HTTP_ACCESS=YES
HTTP_USERID=YES
-HTTP_STATUS=YES
+HTTP_STATUS=NO
HTTP_REWRITE=YES
HTTP_PROXY=YES
@@ -183,22 +183,72 @@
PREFIX=/usr/local/nginx
fi
-if [ ".$SBIN_PATH" = "." ]; then
- SBIN_PATH=$PREFIX/sbin/nginx
-fi
-if [ ".$CONF_PATH" = "." ]; then
- CONF_PATH=$PREFIX/conf/nginx.conf
-fi
+case ".$SBIN_PATH" in
+ ./*)
+ ;;
-if [ ".$PID_PATH" = "." ]; then
- PID_PATH=$PREFIX/logs/nginx.pid
-fi
+ .)
+ SBIN_PATH=$PREFIX/sbin/nginx
+ ;;
-if [ ".$ERROR_LOG_PATH" = "." ]; then
- ERROR_LOG_PATH=$PREFIX/logs/error.log
-fi
+ *)
+ SBIN_PATH=$PREFIX/$SBIN_PATH
+ ;;
+esac
-if [ ".$HTTP_LOG_PATH" = "." ]; then
- HTTP_LOG_PATH=$PREFIX/logs/access.log
-fi
+
+case ".$CONF_PATH" in
+ ./*)
+ ;;
+
+ .)
+ CONF_PATH=$PREFIX/conf/nginx.conf
+ ;;
+
+ *)
+ CONF_PATH=$PREFIX/$CONF_PATH
+ ;;
+esac
+
+
+case ".$PID_PATH" in
+ ./*)
+ ;;
+
+ .)
+ PID_PATH=$PREFIX/logs/nginx.pid
+ ;;
+
+ *)
+ PID_PATH=$PREFIX/$PID_PATH
+ ;;
+esac
+
+
+case ".$ERROR_LOG_PATH" in
+ ./*)
+ ;;
+
+ .)
+ ERROR_LOG_PATH=$PREFIX/logs/error.log
+ ;;
+
+ *)
+ ERROR_LOG_PATH=$PREFIX/$ERROR_LOG_PATH
+ ;;
+esac
+
+
+case ".$HTTP_LOG_PATH" in
+ ./*)
+ ;;
+
+ .)
+ HTTP_LOG_PATH=$PREFIX/logs/access.log
+ ;;
+
+ *)
+ HTTP_LOG_PATH=$PREFIX/$HTTP_LOG_PATH
+ ;;
+esac
