From: Eric Covener <covener@apache.org>
Date: Thu, 19 Mar 2020 15:50:18 +0000 (+0000)
Subject: fix apxs for non-destdir builds
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1578
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e40c1b25b5640573024cdbc1047919ce2bf915a;p=thirdparty%2Fapache%2Fhttpd.git

fix apxs for non-destdir builds

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

(you will need to re-run configure)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875429 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/support/apxs.in b/support/apxs.in
index f7110978e6a..b2705faf5b7 100644
--- a/support/apxs.in
+++ b/support/apxs.in
@@ -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 = ();