Fix two references to the wrong files in binbuild.sh

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

diff --git a/build/binbuild.sh b/build/binbuild.sh
index 30ef3eb298988717fa33426c9bf00a57fe5d9189..04e184971ce25690adc5ed9e24856cbfb50718bf 100755 (executable)
--- a/build/binbuild.sh
+++ b/build/binbuild.sh
@@ -220,7 +220,7 @@ cp README.bindist ../apache_$VER-$OS.README
   echo "       -e \"s;\@libexecdir\@;\$SR/libexec;\" -e \"s;\@includedir\@;\$SR/include;\" \\" && \
   echo "       -e \"s;\@sysconfdir\@;\$SR/conf;\" bindist/bin/apxs > \$SR/bin/apxs" && \
   echo "sed -e \"s;^#!/.*;#!\$PERL;\" bindist/bin/dbmmanage > \$SR/bin/dbmmanage" && \
-  echo "sed -e \"s%/usr/local/apache%\$SR%\" \$SR/conf/httpd.conf.default > \$SR/conf/httpd.conf" && \
+  echo "sed -e \"s%/usr/local/apache%\$SR%\" \$SR/conf/httpd-std.conf > \$SR/conf/httpd.conf" && \
   echo "sed -e \"s%PIDFILE=%PIDFILE=\$SR/%\" -e \"s%HTTPD=%HTTPD=\\\"\$SR/%\" -e \"s%httpd\$%httpd -d \$SR -R \$SR/libexec\\\"%\" bindist/bin/apachectl > \$SR/bin/apachectl" && \
   echo " " && \
   echo "echo \"Ready.\"" && \
@@ -251,7 +251,7 @@ sed -e "s%\"htdocs%\"/usr/local/apache/htdocs%" \
     -e "s%^ServerAdmin.*%ServerAdmin you@your.address%" \
     -e "s%#ServerName.*%#ServerName localhost%" \
     -e "s%Port 8080%Port 80%" \
-    bindist/conf/httpd.conf.default > bindist/conf/httpd.conf
+    bindist/conf/httpd-std.conf > bindist/conf/httpd.conf
 cp bindist/conf/httpd.conf bindist/conf/httpd.conf.default
 
 echo "Creating distribution archive and readme file..."