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

diff --git a/CHANGES b/CHANGES
index 4e2c001e169219be3e0639454e0272b2f4b14d4c..e9f1bf7720c94819f355e6c593a501aaa6343112 100644 (file)
--- 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 d3693ee6c44d2ff40d75dedbb6832de86339d86d..314be2d4d5228c4a340512334802fa23b09dba37 100755 (executable)
--- 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