Module Name: src
Committed By: snj
Date: Tue Nov 28 16:19:51 UTC 2023
Modified Files:
src/usr.sbin/sysinst [netbsd-10]: Makefile.inc
Log Message:
Pull up following revision(s) (requested by martin in ticket #479):
usr.sbin/sysinst/Makefile.inc: revision 1.47
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.45 -r1.45.2.1 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.45 src/usr.sbin/sysinst/Makefile.inc:1.45.2.1
--- src/usr.sbin/sysinst/Makefile.inc:1.45 Sun Jan 9 16:39:50 2022
+++ src/usr.sbin/sysinst/Makefile.inc Tue Nov 28 16:19:51 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.45 2022/01/09 16:39:50 martin Exp $
+# $NetBSD: Makefile.inc,v 1.45.2.1 2023/11/28 16:19:51 snj 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\"
