summaryrefslogtreecommitdiff
path: root/build/binbuild.sh
diff options
context:
space:
mode:
authorRyan Bloom <rbb@apache.org>2000-12-21 01:50:44 +0000
committerRyan Bloom <rbb@apache.org>2000-12-21 01:50:44 +0000
commit4473f59fd562a5e9098f63b0a0da172b27bbdfe4 (patch)
tree4ba6fdade94e0a6f56d939b7b9d0e3399cf65477 /build/binbuild.sh
parentc876e8476ac74ee03c6e8267a63d75ec8096d251 (diff)
downloadhttpd-4473f59fd562a5e9098f63b0a0da172b27bbdfe4.tar.gz
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
Diffstat (limited to 'build/binbuild.sh')
-rwxr-xr-xbuild/binbuild.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/build/binbuild.sh b/build/binbuild.sh
index 30ef3eb298..04e184971c 100755
--- 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..."