Module Name: src
Committed By: martin
Date: Thu Oct 31 09:44:13 UTC 2019
Modified Files:
src/usr.sbin/sysinst: Makefile.inc
Log Message:
After RELEASEMACHINEDIR has the right defaults now, simplify subdir settings
and do not hardcode any architecture exceptions.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 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.27 src/usr.sbin/sysinst/Makefile.inc:1.28
--- src/usr.sbin/sysinst/Makefile.inc:1.27 Sun Oct 13 07:28:21 2019
+++ src/usr.sbin/sysinst/Makefile.inc Thu Oct 31 09:44:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.27 2019/10/13 07:28:21 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.28 2019/10/31 09:44:13 martin Exp $
#
# Makefile for sysinst
@@ -74,10 +74,8 @@ CPPFLAGS+= -I. -I${.CURDIR}/../.. -I${.C
${NODISKLABEL:D-DNO_DISKLABEL} \
${NOPARTMAN:D-DNO_PARTMAN}
-.if ${MACHINE} == "evbarm" \
- || ${MACHINE} == "evbmips" \
- || ${MACHINE} == "evbsh3"
-CPPFLAGS+= -DARCH_SUBDIR="\"${MACHINE}-${MACHINE_ARCH}\""
+.if ${RELEASEMACHINEDIR} != ${MACHINE}
+CPPFLAGS+= -DARCH_SUBDIR="\"${RELEASEMACHINEDIR}\""
CPPFLAGS+= -DPKG_ARCH_SUBDIR="\"${MACHINE_ARCH}\""
.endif
