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

diff --git a/changes-entries/apxs-i-wo-n.txt b/changes-entries/apxs-i-wo-n.txt
new file mode 100644 (file)
index 0000000..8adcfa1
--- /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 65e1288527da4c60153f1becdd3d1d9ca2ffe78e..4a9906257790c33620a1f612f457833274dd5c21 100644 (file)
--- 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|^[^/]+/||;