summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Trawick <trawick@apache.org>2002-06-13 18:46:28 +0000
committerJeff Trawick <trawick@apache.org>2002-06-13 18:46:28 +0000
commit0eaf6dc627ee2f15863fb29f95671eea057f29a4 (patch)
tree713037c9a6b51cf460eca68d103942fe0d0c4e6a
parentd2f37343af4bbaab5c9e80c253be5f4076eb12ae (diff)
downloadhttpd-0eaf6dc627ee2f15863fb29f95671eea057f29a4.tar.gz
Fix install-bindist.sh so that it finds any perl instead of just
early perl 5.x versions. This is consistent with a build/install from source, and it allows the perl scripts installed by a bindist to work on systems with perl 5.6. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95651 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--CHANGES5
-rwxr-xr-xbuild/install-bindist.sh.in2
2 files changed, 6 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 4e2c001e16..e9f1bf7720 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,10 @@
Changes with Apache 2.0.38
+ *) Fix install-bindist.sh so that it finds any perl instead of just
+ early perl 5.x versions. This is consistent with a build/install
+ from source, and it allows the perl scripts installed by a bindist
+ to work on systems with perl 5.6. [Jeff Trawick]
+
*) Fix apxs so that the makefile created by "apxs -g" works on AIX and
Tru64 (and probably some other platforms). [Jeff Trawick]
diff --git a/build/install-bindist.sh.in b/build/install-bindist.sh.in
index d3693ee6c4..314be2d4d5 100755
--- a/build/install-bindist.sh.in
+++ b/build/install-bindist.sh.in
@@ -54,7 +54,7 @@ path=`echo $PATH | sed -e 's/:/ /g'`
for dir in ${path} ; do
for pperl in ${perls} ; do
if test -f "${dir}/${pperl}" ; then
- if `${dir}/${pperl} -v | grep 'version 5\.' >/dev/null 2>&1` ; then
+ if `${dir}/${pperl} -v >/dev/null 2>&1` ; then
PERL="${dir}/${pperl}"
break
fi