update after backport

[apache] / build / binbuild.sh

diff --git a/build/binbuild.sh b/build/binbuild.sh
index 1a6cf6059f42bf1c67f5b97aa060539fc64fd505..92fe0a723e99eccd45a9f9f549585427649b4f34 100755 (executable)
--- a/build/binbuild.sh
+++ b/build/binbuild.sh
@@ -1,25 +1,39 @@
 #!/bin/sh
+#      
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
 #
-# binbuild.sh - Builds an Apache binary distribution.
-# Initially written by Lars Eilebrecht <lars@apache.org>.
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
-# This script falls under the Apache License.
-# See http://www.apache.org/docs/LICENSE
+#
+# binbuild.sh - Builds an Apache binary distribution.
+# Initially written by Lars Eilebrecht <lars apache.org>.
 
-OS=`./srclib/apr/build/config.guess`
+OS=`./build/config.guess`
+PRINTPATH="build/PrintPath"
 APFULLDIR=`pwd`
 BUILD_DIR="$APFULLDIR/bindist"
 DEFAULT_DIR="/usr/local/apache2"
-APDIR=$APFULLDIR
+APDIR="$APFULLDIR"
 APDIR=`basename $APDIR`
 CONFIGPARAM="--enable-layout=Apache --prefix=$BUILD_DIR --enable-mods-shared=most --with-expat=$APFULLDIR/srclib/apr-util/xml/expat --enable-static-support"
 VER=`echo $APDIR | sed s/httpd-//`
-TAR="`srclib/apr/build/PrintPath tar`"
-GZIP="`srclib/apr/build/PrintPath gzip`"
-COMPRESS="`srclib/apr/build/PrintPath compress`"
-MD5="`srclib/apr/build/PrintPath md5`"
+TAR="`$PRINTPATH tar`"
+GZIP="`$PRINTPATH gzip`"
+COMPRESS="`$PRINTPATH compress`"
+MD5="`$PRINTPATH md5`"
 if [ x$MD5 = x ]; then
-  OPENSSL="`srclib/apr/build/PrintPath openssl`"
+  OPENSSL="`$PRINTPATH openssl`"
   if [ x$OPENSSL != x ]; then
     MD5="$OPENSSL md5"
   fi