From: Randy Terbush <randy@apache.org>
Date: Tue, 10 Aug 1999 16:06:52 +0000 (+0000)
Subject: Fix some changed assumptions in config file format.
X-Git-Tag: 1.3.8~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=946493435c19d3247bae400fa0ff82d8e09548c5;p=apache

Fix some changed assumptions in config file format.

Submitted by:	Tony Finch
Reviewed by:	Randy Terbush


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

diff --git a/build/binbuild.sh b/build/binbuild.sh
index a7020fe984..0bbb28eefa 100755
--- a/build/binbuild.sh
+++ b/build/binbuild.sh
@@ -222,7 +222,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.conf.default > \$SR/conf/httpd.conf" && \
   echo "sed -e \"s%PIDFILE=%PIDFILE=\$SR/%\" -e \"s%HTTPD=%HTTPD=\\\"\$SR/%\" -e \"s%httpd\$%httpd -d \$SR\\\"%\" bindist/bin/apachectl > \$SR/bin/apachectl" && \
   echo " " && \
   echo "echo \"Ready.\"" && \
@@ -246,9 +246,10 @@ cp README.bindist ../apache_$VER-$OS.README
 ) > install-bindist.sh
 chmod 755 install-bindist.sh
 
-sed -e "s%\"/htdocs%\"/usr/local/apache/htdocs%" \
-    -e "s%\"/icons%\"/usr/local/apache/icons%" \
-    -e "s%\"/cgi-bin%\"/usr/local/apache/cgi-bin%" \
+sed -e "s%\"htdocs%\"/usr/local/apache/htdocs%" \
+    -e "s%\"icons%\"/usr/local/apache/icons%" \
+    -e "s%\"cgi-bin%\"/usr/local/apache/cgi-bin%" \
+    -e "s%\"proxy%\"/usr/local/apache/proxy%" \
     -e "s%^ServerAdmin.*%ServerAdmin you@your.address%" \
     -e "s%#ServerName.*%#ServerName localhost%" \
     -e "s%Port 8080%Port 80%" \