- DESTDIR patch

Changed files:
    nginx-DESTDIR.patch -> 1.1

diff --git a/nginx-DESTDIR.patch b/nginx-DESTDIR.patch
new file mode 100644 (file)
index 0000000..1a148fd
--- /dev/null
+++ b/nginx-DESTDIR.patch
@@ -0,0 +1,73 @@
+--- ./auto/install~    2005-02-22 20:46:02.000000000 +0200
++++ ./auto/install     2005-08-13 11:37:32.000000000 +0300
+@@ -5,40 +5,40 @@
+ cat << END                                                    >> $NGX_MAKEFILE
+ 
+ install:      $NGX_OBJS${ngx_dirsep}nginx${ngx_binext}
+-      test -d '$NGX_PREFIX' || mkdir -p '$NGX_PREFIX'
++      test -d '\$(DESTDIR)/$NGX_PREFIX' || mkdir -p '\$(DESTDIR)/$NGX_PREFIX'
+ 
+-      test -d '`dirname "$NGX_SBIN_PATH"`' \
+-              || mkdir -p '`dirname "$NGX_SBIN_PATH"`'
+-      test ! -f '$NGX_SBIN_PATH' || mv '$NGX_SBIN_PATH' '$NGX_SBIN_PATH.old'
+-      cp $NGX_OBJS/nginx '$NGX_SBIN_PATH'
++      test -d '\$(DESTDIR)/`dirname "$NGX_SBIN_PATH"`' \
++              || mkdir -p '\$(DESTDIR)/`dirname "$NGX_SBIN_PATH"`'
++      test ! -f '\$(DESTDIR)/$NGX_SBIN_PATH' || mv '\$(DESTDIR)/$NGX_SBIN_PATH' '\$(DESTDIR)/$NGX_SBIN_PATH.old'
++      cp $NGX_OBJS/nginx '\$(DESTDIR)/$NGX_SBIN_PATH'
+ 
+-      test -d '`dirname "$NGX_CONF_PATH"`' \
+-              || mkdir -p '`dirname "$NGX_CONF_PATH"`'
++      test -d '\$(DESTDIR)/`dirname "$NGX_CONF_PATH"`' \
++              || mkdir -p '\$(DESTDIR)/`dirname "$NGX_CONF_PATH"`'
+ 
+-      cp conf/koi-win '`dirname "$NGX_CONF_PATH"`'
++      cp conf/koi-win '\$(DESTDIR)/`dirname "$NGX_CONF_PATH"`'
+ 
+-      test -f '`dirname "$NGX_CONF_PATH"`/mime.types' || \
+-              cp conf/mime.types '`dirname "$NGX_CONF_PATH"`/mime.types'
++      test -f '\$(DESTDIR)/`dirname "$NGX_CONF_PATH"`/mime.types' || \
++              cp conf/mime.types '\$(DESTDIR)/`dirname "$NGX_CONF_PATH"`/mime.types'
+       cp conf/mime.types '`dirname "$NGX_CONF_PATH"`/mime.types.default'
+ 
+-      test -f '$NGX_CONF_PATH' || cp conf/nginx.conf '$NGX_CONF_PATH'
+-      cp conf/nginx.conf '`dirname "$NGX_CONF_PATH"`/nginx.conf.default'
++      test -f '\$(DESTDIR)/$NGX_CONF_PATH' || cp conf/nginx.conf '\$(DESTDIR)/$NGX_CONF_PATH'
++      cp conf/nginx.conf '\$(DESTDIR)/`dirname "$NGX_CONF_PATH"`/nginx.conf.default'
+ 
+-      test -d '`dirname "$NGX_PID_PATH"`' \
+-              || mkdir -p '`dirname "$NGX_PID_PATH"`'
++      test -d '\$(DESTDIR)/`dirname "$NGX_PID_PATH"`' \
++              || mkdir -p '\$(DESTDIR)/`dirname "$NGX_PID_PATH"`'
+ 
+-      test -d '`dirname "$NGX_HTTP_LOG_PATH"`' || \
+-              mkdir -p '`dirname "$NGX_HTTP_LOG_PATH"`'
++      test -d '\$(DESTDIR)/`dirname "$NGX_HTTP_LOG_PATH"`' || \
++              mkdir -p '\$(DESTDIR)/`dirname "$NGX_HTTP_LOG_PATH"`'
+ 
+-      test -d '$NGX_PREFIX/html' || cp -r html '$NGX_PREFIX'
++      test -d '\$(DESTDIR)/$NGX_PREFIX/html' || cp -r html '\$(DESTDIR)/$NGX_PREFIX'
+ END
+ 
+ 
+ if test -n "$NGX_ERROR_LOG_PATH"; then
+     cat << END                                                >> $NGX_MAKEFILE
+ 
+-      test -d '`dirname "$NGX_ERROR_LOG_PATH"`' || \
+-              mkdir -p '`dirname "$NGX_ERROR_LOG_PATH"`'
++      test -d '\$(DESTDIR)/`dirname "$NGX_ERROR_LOG_PATH"`' || \
++              mkdir -p '\$(DESTDIR)/`dirname "$NGX_ERROR_LOG_PATH"`'
+ END
+ 
+ fi
+--- ./auto/install~    2005-08-13 11:39:08.000000000 +0300
++++ ./auto/install     2005-08-13 11:40:27.000000000 +0300
+@@ -19,7 +19,7 @@
+ 
+       test -f '\$(DESTDIR)/`dirname "$NGX_CONF_PATH"`/mime.types' || \
+               cp conf/mime.types '\$(DESTDIR)/`dirname "$NGX_CONF_PATH"`/mime.types'
+-      cp conf/mime.types '`dirname "$NGX_CONF_PATH"`/mime.types.default'
++      cp conf/mime.types '\$(DESTDIR)/`dirname "$NGX_CONF_PATH"`/mime.types.default'
+ 
+       test -f '\$(DESTDIR)/$NGX_CONF_PATH' || cp conf/nginx.conf '\$(DESTDIR)/$NGX_CONF_PATH'
+       cp conf/nginx.conf '\$(DESTDIR)/`dirname "$NGX_CONF_PATH"`/nginx.conf.default'