diff options
| -rw-r--r-- | mk/bsd.pkg.mk | 5 | ||||
| -rw-r--r-- | mk/bsd.prefs.mk | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 439eeec518e..ad07902ee01 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.879 2001/12/11 16:28:55 abs Exp $ +# $NetBSD: bsd.pkg.mk,v 1.880 2001/12/12 12:31:14 abs Exp $ # # This file is in the public domain. # @@ -521,6 +521,7 @@ PLIST_SUBST+= OPSYS=${OPSYS} \ MACHINE_GNU_PLATFORM=${MACHINE_GNU_PLATFORM} \ LOWER_VENDOR=${LOWER_VENDOR} \ LOWER_OPSYS=${LOWER_OPSYS} \ + LOWER_OS_VERSION=${LOWER_OS_VERSION} \ PKGBASE=${PKGBASE} \ PKGNAME=${PKGNAME} \ PKGLOCALEDIR=${PKGLOCALEDIR} \ @@ -3212,6 +3213,7 @@ print-PLIST: -e 's@${MACHINE_GNU_PLATFORM}@\$${MACHINE_GNU_PLATFORM}@' \ -e 's@${LOWER_VENDOR}@\$${LOWER_VENDOR}@' \ -e 's@${LOWER_OPSYS}@\$${LOWER_OPSYS}@' \ + -e 's@${LOWER_OS_VERSION}@\$${LOWER_OS_VERSION}@' \ -e 's@${PKGNAME}@\$${PKGNAME}@' \ | ( ${GREP} -v emul/linux/proc || ${TRUE} ) \ | ${SORT} \ @@ -3264,6 +3266,7 @@ print-PLIST: -e s@${MACHINE_GNU_PLATFORM}@\$${MACHINE_GNU_PLATFORM}@ \ -e s@${LOWER_VENDOR}@\$${LOWER_VENDOR}@ \ -e s@${LOWER_OPSYS}@\$${LOWER_OPSYS}@ \ + -e s@${LOWER_OS_VERSION}@\$${LOWER_OS_VERSION}@ \ -e s@${PKGNAME}@\$${PKGNAME}@ \ | ${GREP} -v emul/linux/proc || ${TRUE} .endif # target(print-PLIST) diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 8860d304592..c1409da9093 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.65 2001/11/28 19:58:13 tv Exp $ +# $NetBSD: bsd.prefs.mk,v 1.66 2001/12/12 12:31:15 abs Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -28,6 +28,9 @@ MAKEFLAGS+= OPSYS=${OPSYS} .ifndef OS_VERSION OS_VERSION!= ${UNAME} -r .endif +.ifndef LOWER_OS_VERSION +LOWER_OS_VERSION!= echo ${OS_VERSION} | tr A-Z a-z +.endif MAKEFLAGS+= OS_VERSION=${OS_VERSION} # Preload these for architectures not in all variations of bsd.own.mk. |