Be less restrictive and allow also `perl util/perlpath.pl /path/to/bin/perl'

in addition to `perl util/perlpath.pl /path/to/bin', because this way one can
also use an interpreter named `perl5' (which is usually the name of Perl 5.xxx
on platforms where an Perl 4.x is still installed as `perl').

Submitted by: Matthias Loepfe <Matthias.Loepfe@adnovum.ch>
Reviewed by: Ralf S. Engelschall

diff --git a/CHANGES b/CHANGES
index b51d031a9cf5f2968e94e60e2c216dab2bb65fe5..7abe7b57368d6e6a334e5aa152c258ef2dbd7185 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,13 @@
 
  Changes between 0.9.1c and 0.9.2
 
 
  Changes between 0.9.1c and 0.9.2
 

+  *) Be less restrictive and allow also `perl util/perlpath.pl
+     /path/to/bin/perl' in addition to `perl util/perlpath.pl /path/to/bin',
+     because this way one can also use an interpreter named `perl5' (which is
+     usually the name of Perl 5.xxx on platforms where an Perl 4.x is still
+     installed as `perl').
+     [Matthias Loepfe <Matthias.Loepfe@adnovum.ch>]
+

   *) Let util/clean-depend.pl work also with older Perl 5.00x versions.
      [Matthias Loepfe <Matthias.Loepfe@adnovum.ch>]
 
   *) Let util/clean-depend.pl work also with older Perl 5.00x versions.
      [Matthias Loepfe <Matthias.Loepfe@adnovum.ch>]
 

diff --git a/util/perlpath.pl b/util/perlpath.pl
index 0aa5ada36768b0d7896e3f583e8cb1d3b3e54c00..a1f236bd9843cf69490c72c532129f9ced4d9d0a 100755 (executable)
--- a/util/perlpath.pl
+++ b/util/perlpath.pl
@@ -17,7 +17,12 @@ sub wanted
        @a=<IN>;
        close(IN);
 
        @a=<IN>;
        close(IN);
 

-       $a[0]="#!$ARGV[0]/perl\n";
+       if (-d $ARGV[0]) {
+               $a[0]="#!$ARGV[0]/perl\n";
+       }
+       else {
+               $a[0]="#!$ARGV[0]\n";
+       }

 
        # Playing it safe...
        $new="$_.new";
 
        # Playing it safe...
        $new="$_.new";