Module Name: src
Committed By: martin
Date: Mon Dec 16 13:48:44 UTC 2019
Modified Files:
src/usr.sbin/sysinst: Makefile.inc
Log Message:
Fix the pattern creating the relative path for distribution sets
on branches: we missed the potential numbers in suffixes, like _RC1.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/usr.sbin/sysinst/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/Makefile.inc
diff -u src/usr.sbin/sysinst/Makefile.inc:1.30 src/usr.sbin/sysinst/Makefile.inc:1.31
--- src/usr.sbin/sysinst/Makefile.inc:1.30 Thu Nov 14 13:58:22 2019
+++ src/usr.sbin/sysinst/Makefile.inc Mon Dec 16 13:48:44 2019
@@ -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+= -DSYSINST_HTTP_HOST=\"nycdn.N
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
