diff options
| author | seb <seb@pkgsrc.org> | 2003-07-20 15:37:46 +0000 |
|---|---|---|
| committer | seb <seb@pkgsrc.org> | 2003-07-20 15:37:46 +0000 |
| commit | 06c5a4ac05a63eab94efb06771d21786eea7e49c (patch) | |
| tree | dfeeca79f0dd6cb0289f9b2d5b80438f58e0b3b0 /pkgtools/libkver | |
| parent | a283327e19037781fb9f4a2cab1819fd99ab4c2e (diff) | |
| download | pkgsrc-06c5a4ac05a63eab94efb06771d21786eea7e49c.tar.gz | |
Add support for picking up KVER_OSRELEASE in "/etc/mk.conf": both
when used as standalone sources and -as MAKECONF is set to /dev/null in
MAKE_ENV by bsd.pkg.mk- as package sources.
Diffstat (limited to 'pkgtools/libkver')
| -rw-r--r-- | pkgtools/libkver/Makefile | 8 | ||||
| -rw-r--r-- | pkgtools/libkver/files/Makefile | 5 | ||||
| -rw-r--r-- | pkgtools/libkver/files/Makefile.inc | 6 |
3 files changed, 13 insertions, 6 deletions
diff --git a/pkgtools/libkver/Makefile b/pkgtools/libkver/Makefile index f234bc4d137..16a2747dbfd 100644 --- a/pkgtools/libkver/Makefile +++ b/pkgtools/libkver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/07/20 13:56:25 seb Exp $ +# $NetBSD: Makefile,v 1.4 2003/07/20 15:37:46 seb Exp $ DISTNAME= libkver-${VERSION} CATEGORIES= pkgtools @@ -21,6 +21,12 @@ VERSION= 0.1 ONLY_FOR_PLATFORM= NetBSD-*-* +.include "../../mk/bsd.prefs.mk" + +.if defined(KVER_OSRELEASE) +MAKE_ENV+= KVER_OSRELEASE=${KVER_OSRELEASE} +.endif + do-extract: @${CP} -Rp ${FILESDIR} ${WRKSRC} diff --git a/pkgtools/libkver/files/Makefile b/pkgtools/libkver/files/Makefile index 7691a3a9307..5347f5aab84 100644 --- a/pkgtools/libkver/files/Makefile +++ b/pkgtools/libkver/files/Makefile @@ -1,6 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2003/07/11 14:50:37 seb Exp $ - -.include "${.CURDIR}/Makefile.inc" +# $NetBSD: Makefile,v 1.2 2003/07/20 15:37:47 seb Exp $ SUBDIR= lib @@ -10,3 +8,4 @@ SUBDIR+= sysctl .endif .include <bsd.subdir.mk> +.include "${.CURDIR}/Makefile.inc" diff --git a/pkgtools/libkver/files/Makefile.inc b/pkgtools/libkver/files/Makefile.inc index 99f473f6731..2751bcd290d 100644 --- a/pkgtools/libkver/files/Makefile.inc +++ b/pkgtools/libkver/files/Makefile.inc @@ -1,4 +1,6 @@ -# $NetBSD: Makefile.inc,v 1.1.1.1 2003/07/11 14:50:37 seb Exp $ +# $NetBSD: Makefile.inc,v 1.2 2003/07/20 15:37:47 seb Exp $ + +.include <bsd.own.mk> SUPPORTED_KVER_OSRELEASES+= 1.5 SUPPORTED_KVER_OSRELEASES+= 1.5.1 @@ -13,7 +15,7 @@ KVER_OSREVISION.1.5.3= 105000300 KVER_OSREVISION.1.6= 106000000 KVER_OSREVISION.1.6.1= 106000100 -.if !empty(SUPPORTED_KVER_OSRELEASES:M${KVER_OSRELEASE}) +.if defined(KVER_OSRELEASE) && !empty(SUPPORTED_KVER_OSRELEASES:M${KVER_OSRELEASE}) CFLAGS+= -D_KVER_OSREVISION=${KVER_OSREVISION.${KVER_OSRELEASE}} .else .BEGIN: |