Copy the error/ tree

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90410 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Makefile.win b/Makefile.win
index 658d59a088dd294bde6ec99390905f390964ce7f..b09cd0a92ba3ee388c6abf825b4e9f887d63ab60 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -240,6 +240,7 @@ _install:
        -mkdir "$(INSTDIR)\bin"
        -mkdir "$(INSTDIR)\cgi-bin"
        -mkdir "$(INSTDIR)\conf"
+       -mkdir "$(INSTDIR)\error"
        -mkdir "$(INSTDIR)\htdocs"
        -mkdir "$(INSTDIR)\htdocs\manual"
        -mkdir "$(INSTDIR)\icons"
@@ -359,6 +360,9 @@ _install:
     }
 <<
         copy docs\cgi-examples\test-cgi.bat "$(INSTDIR)\cgi-bin"
+        xcopy docs\error "$(INSTDIR)\error" /d < <<
+A
+<<
         xcopy docs\docroot "$(INSTDIR)\htdocs" /d < <<
 A
 <<

diff --git a/build/binbuild.sh b/build/binbuild.sh
index 36192c3afa4890aad22184ffd87df7a6f99efe6f..f646508b4cf4eeb6c0629d59605b1254845d1018 100755 (executable)
--- a/build/binbuild.sh
+++ b/build/binbuild.sh
@@ -215,6 +215,12 @@ cp README.bindist ../httpd-$VER-$OS.README
   echo "else" && \
   echo "  lcopy bindist/htdocs \$SR/htdocs 755 644" && \
   echo "fi" && \
+  echo "if [ -d \$SR/error ]" && \
+  echo "then" && \
+  echo "  echo \"[Preserving existing error documents directory.]\"" && \
+  echo "else" && \
+  echo "  lcopy bindist/error \$SR/error 755 644" && \
+  echo "fi" && \
   echo " " && \
   echo "sed -e \"s;^#!/.*;#!\$PERL;\" -e \"s;\@prefix\@;\$SR;\" -e \"s;\@sbindir\@;\$SR/bin;\" \\" && \
   echo "       -e \"s;\@libexecdir\@;\$SR/libexec;\" -e \"s;\@includedir\@;\$SR/include;\" \\" && \