svn commit: r1875475 - in /httpd/httpd/branches/2.4.x: ./ support/apxs.in

[co...@apache.org]

Author: covener
Date: Fri Mar 20 13:00:44 2020
New Revision: 1875475

URL: http://svn.apache.org/viewvc?rev=1875475&view=rev
Log:
Merge r1875429 from trunk:

fix apxs for non-destdir builds

subtr(...,0, -1) chops off a character and leaves relative path.

(you will need to re-run configure)



Reviewed By: +1: covener, gbechis, rpluem


Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/support/apxs.in

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1875429

Modified: httpd/httpd/branches/2.4.x/support/apxs.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/support/apxs.in?rev=1875475&r1=1875474&r2=1875475&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/support/apxs.in (original)
+++ httpd/httpd/branches/2.4.x/support/apxs.in Fri Mar 20 13:00:44 2020
@@ -26,7 +26,12 @@ package apxs;
 #   are we building in a cross compile environment? If so, destdir contains
 #   the base directory of the cross compiled environment, otherwise destdir
 #   is the empty string.
-my $destdir = substr($0, 0, rindex($0, "@exp_bindir@"));
+
+my $destdir = "";
+my $ddi = rindex($0, "@exp_bindir@");
+if ($ddi >= 0) {
+  $destdir = substr($0, 0, $ddi);
+}
 
 my %config_vars = ();