Module Name: src
Committed By: martin
Date: Tue Nov 28 14:10:18 UTC 2023
Modified Files:
src/usr.sbin/sysinst: Makefile.inc
Log Message:
PR 57729: clean up PKG_PATH for official RC (and similar) versions,
like we do for the daily builds.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 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.46 src/usr.sbin/sysinst/Makefile.inc:1.47
--- src/usr.sbin/sysinst/Makefile.inc:1.46 Sat Jun 3 09:09:24 2023
+++ src/usr.sbin/sysinst/Makefile.inc Tue Nov 28 14:10:18 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.46 2023/06/03 09:09:24 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.47 2023/11/28 14:10:18 martin Exp $
#
# Makefile for sysinst
@@ -106,6 +106,8 @@ CPPFLAGS+= -DPKG_ARCH_SUBDIR="\"${MACHIN
.if defined(NETBSD_OFFICIAL_RELEASE) && ${NETBSD_OFFICIAL_RELEASE} == "yes"
CPPFLAGS+= -DSYSINST_FTP_HOST=\"ftp.NetBSD.org\" -DNETBSD_OFFICIAL_RELEASE
CPPFLAGS+= -DSYSINST_HTTP_HOST=\"cdn.NetBSD.org\" -DNETBSD_OFFICIAL_RELEASE
+CPPFLAGS+= -DREL_PATH=\"netbsd-${DISTRIBVER:C/\.[0-9][_A-Z]*[0-9]*$//:S/./-/}\"
+CPPFLAGS+= -DPKG_SUBDIR="\"${DISTRIBVER:C/_.*$//}\""
.else
CPPFLAGS+= -DSYSINST_FTP_HOST=\"nyftp.NetBSD.org\"
CPPFLAGS+= -DSYSINST_HTTP_HOST=\"nycdn.NetBSD.org\"
