[src/trunk]: src/usr.sbin/sysinst Fix the pattern creating the relative path ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/75e1e1144e7f
branches:  trunk
changeset: 847270:75e1e1144e7f
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Dec 16 13:48:44 2019 +0000

description:
Fix the pattern creating the relative path for distribution sets
on branches: we missed the potential numbers in suffixes, like _RC1.

diffstat:

 usr.sbin/sysinst/Makefile.inc |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (22 lines):

diff -r 5bc06932e79c -r 75e1e1144e7f usr.sbin/sysinst/Makefile.inc
--- a/usr.sbin/sysinst/Makefile.inc     Mon Dec 16 12:40:17 2019 +0000
+++ b/usr.sbin/sysinst/Makefile.inc     Mon Dec 16 13:48:44 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.30 2019/11/14 13:58:22 martin Exp $
+#      $NetBSD: Makefile.inc,v 1.31 2019/12/16 13:48:44 martin Exp $
 #
 # Makefile for sysinst
 
@@ -96,10 +96,10 @@
 CPPFLAGS+= -DREL_PATH=\"HEAD\"
 CPPFLAGS+= -DPKG_SUBDIR="\"${DISTRIBVER:C/\.99\.[0-9]*[_A-Z]*$//}.0\""
 .elif (${DISTRIBVER:M*.[0-9].[0-9]*})
-CPPFLAGS+= -DREL_PATH=\"netbsd-${DISTRIBVER:C/\.[0-9][_A-Z]*$//:S/./-/}\"
+CPPFLAGS+= -DREL_PATH=\"netbsd-${DISTRIBVER:C/\.[0-9][_A-Z]*[0-9]*$//:S/./-/}\"
 CPPFLAGS+= -DPKG_SUBDIR="\"${DISTRIBVER:C/_.*$//}\""
 .elif (${DISTRIBVER:M*.[0-9]*})
-CPPFLAGS+= -DREL_PATH=\"netbsd-${DISTRIBVER:C/\.[0-9][_A-Z]*$//}\"
+CPPFLAGS+= -DREL_PATH=\"netbsd-${DISTRIBVER:C/\.[0-9][_A-Z]*[0-9]*$//}\"
 CPPFLAGS+= -DPKG_SUBDIR="\"${DISTRIBVER:C/_.*$//}\""
 .endif
 .endif