From 21e6989f8df8a6c188f993dbe11f44b712a98c34 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@apache.org>
Date: Fri, 7 Jul 2023 07:57:35 +0000
Subject: [PATCH] apxs: Fix -i for some cases where -n is not used. The $base
 was already stripped of suffix in typical case.

Submitted by: Jan Pazdziora <jpazdziora redhat.com>
Github: closes #359


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1910841 13f79535-47bb-0310-9956-ffa450edef68
---
 changes-entries/apxs-i-wo-n.txt | 2 ++
 support/apxs.in                 | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 changes-entries/apxs-i-wo-n.txt

diff --git a/changes-entries/apxs-i-wo-n.txt b/changes-entries/apxs-i-wo-n.txt
new file mode 100644
index 0000000000..8adcfa1afb
--- /dev/null
+++ b/changes-entries/apxs-i-wo-n.txt
@@ -0,0 +1,2 @@
+  *) apxs: Fix -i in some cases where -n is not used.
+     [Jan Pazdziora <jpazdziora redhat.com>]
diff --git a/support/apxs.in b/support/apxs.in
index 65e1288527..4a99062577 100644
--- a/support/apxs.in
+++ b/support/apxs.in
@@ -538,7 +538,7 @@ if ($opt_i or $opt_e) {
                 }
             }
             if ($name eq '') {
-                if ($base =~ m|.*mod_([a-zA-Z0-9_]+)\..+|) {
+                if ($base =~ m/.*mod_([a-zA-Z0-9_]+)(\..+|$)/) {
                     $name = "$1";
                     $filename = $base;
                     $filename =~ s|^[^/]+/||;