Ticket #15948: patch-auto-install.diff

auto/install

@@ -7 +7 @@
     cat << END                                                >> $NGX_MAKEFILE
 
 install_perl_modules:
-        cd $NGX_OBJS/src/http/modules/perl && make install
+        cd $NGX_OBJS/src/http/modules/perl && make pure_install
 END
 
     NGX_INSTALL_PERL_MODULES=install_perl_modules
@@ -35 +35 @@
         cp conf/koi-utf '\$(DESTDIR)$NGX_CONF_PREFIX'
         cp conf/win-utf '\$(DESTDIR)$NGX_CONF_PREFIX'
 
-        test -f '\$(DESTDIR)$NGX_CONF_PREFIX/mime.types' \
-                || cp conf/mime.types '\$(DESTDIR)$NGX_CONF_PREFIX'
-        cp conf/mime.types '\$(DESTDIR)$NGX_CONF_PREFIX/mime.types.default'
-
-        test -f '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params' \
-                || cp conf/fastcgi_params '\$(DESTDIR)$NGX_CONF_PREFIX'
-        cp conf/fastcgi_params \
-                '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params.default'
-
-        test -f '\$(DESTDIR)$NGX_CONF_PATH' \
-                || cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX'
-        cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.default'
+        cp conf/mime.types '\$(DESTDIR)$NGX_CONF_PREFIX/mime.types.example'
+
+        cp conf/fastcgi_params '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params.example'
+
+        cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.example'
 
         test -d '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' \
                 || mkdir -p '\$(DESTDIR)`dirname "$NGX_PID_PATH"`'
@@ -54 +47 @@
         test -d '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' || \
                 mkdir -p '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`'
 
-        test -d '\$(DESTDIR)$NGX_PREFIX/html' \
-                || cp -r html '\$(DESTDIR)$NGX_PREFIX'
+        test -d '\$(DESTDIR)$NGX_PREFIX/share/nginx/html' || \
+                mkdir -p '\$(DESTDIR)$NGX_PREFIX/share/nginx/html' && \
+                cp -r html '\$(DESTDIR)$NGX_PREFIX/share/nginx'
 END