Made it possible to build/install from the SVN checkout.

diff --git a/auto/install b/auto/install
index d77efbf74cea36f13fd05bfc78861a3b986b54d5..d56be27ef93d7e4da59b84bda2decc32d5b4aa30 100644 (file)
--- a/auto/install
+++ b/auto/install
@@ -72,16 +72,28 @@ case ".$NGX_HTTP_LOG_PATH" in
 esac
 
 
+if test -e man/nginx.8 ; then
+    NGX_MAN=man/nginx.8
+else
+    NGX_MAN=docs/man/nginx.8
+fi
+
+if test -d html ; then
+    NGX_HTML=html
+else
+    NGX_HTML=docs/html
+fi
+
 cat << END                                                    >> $NGX_MAKEFILE
 
 manpage:       $NGX_OBJS/nginx.8
 
-$NGX_OBJS/nginx.8:     man/nginx.8 $NGX_AUTO_CONFIG_H
+$NGX_OBJS/nginx.8:     $NGX_MAN $NGX_AUTO_CONFIG_H
        sed -e "s|%%PREFIX%%|$NGX_PREFIX|" \\
                -e "s|%%PID_PATH%%|$NGX_PID_PATH|" \\
                -e "s|%%CONF_PATH%%|$NGX_CONF_PATH|" \\
                -e "s|%%ERROR_LOG_PATH%%|${NGX_ERROR_LOG_PATH:-stderr}|" \\
-               < man/nginx.8 > $NGX_OBJS/nginx.8
+               < $NGX_MAN > \$@
 
 install:       $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \
                $NGX_INSTALL_PERL_MODULES
@@ -135,7 +147,7 @@ install:    $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \
                mkdir -p '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`'
 
        test -d '\$(DESTDIR)$NGX_PREFIX/html' \
-               || cp -r html '\$(DESTDIR)$NGX_PREFIX'
+               || cp -R $NGX_HTML '\$(DESTDIR)$NGX_PREFIX'
 END