2 files changed, 14 insertions, 1 deletions

diff --git a/miscutils/make.c b/miscutils/make.c
index 42fac7f77..7b54bfe95 100644
--- a/miscutils/make.c
+++ b/miscutils/make.c
@@ -520,7 +520,7 @@ is_valid_macro(const char *name)
         for (s = name; *s; ++s) {
                 // In POSIX mode only a limited set of characters are guaranteed
                 // to be allowed in macro names.
-                if (posix && !isfname(*s))
+                if (posix && !ispname(*s))
                         return FALSE;
                 // As an extension allow anything that can get through the
                 // input parser, apart from the following.
diff --git a/testsuite/make.tests b/testsuite/make.tests
index 70c1231b9..8a0f1a7d2 100755
--- a/testsuite/make.tests
+++ b/testsuite/make.tests
@@ -339,6 +339,19 @@ target:
 b}
 '
 
+# POSIX 202X permits additional characters in macro and target names
+testing "make allow - and / in target names, - in macro names" \
+        "make -f -" \
+        "/hello\nhel-lo\nmac-ro\n" "" '
+target: ./hello hel-lo
+        @echo $(mac-ro)
+./hello:
+        @echo /hello
+hel-lo:
+        @echo hel-lo
+mac-ro = mac-ro
+'
+
 testing "make double-colon rule" \
         "make -f -" "target1\ntarget2\n" "" '
 target::