diff options
author | hubertf <hubertf> | 1997-12-13 21:28:24 +0000 |
---|---|---|
committer | hubertf <hubertf> | 1997-12-13 21:28:24 +0000 |
commit | fe79993e7d402c7eade7e7beca681b373f0d7ec6 (patch) | |
tree | bdb57b1851a5a3bf8cbe756ba78abca72e2d050d /mk | |
parent | e67a5692723dd0c576da019184f63265e0c408ea (diff) | |
download | pkgsrc-fe79993e7d402c7eade7e7beca681b373f0d7ec6.tar.gz |
- move definition of ARCH and OPSYS so it is even available if
ONLY_FOR_ARCHS is set
- Usage points to PLIST_SRC
Diffstat (limited to 'mk')
-rw-r--r-- | mk/bsd.pkg.mk | 18 | ||||
-rw-r--r-- | mk/bsd.port.mk | 18 |
2 files changed, 18 insertions, 18 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index abb6762d72f..42168528313 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,7 +1,7 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $NetBSD: bsd.pkg.mk,v 1.23 1997/12/03 08:32:01 hubertf Exp $ +# $NetBSD: bsd.pkg.mk,v 1.24 1997/12/13 21:28:24 hubertf Exp $ # # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. @@ -283,6 +283,12 @@ NetBSD_MAINTAINER= agc@netbsd.org # NEVER override the "regular" targets unless you want to open # a major can of worms. +# Get the architecture +ARCH!= uname -m + +# Get the operating system type +OPSYS!= uname -s + .if defined(ONLY_FOR_ARCHS) .for __ARCH in ${ONLY_FOR_ARCHS} .if ${MACHINE_ARCH} == "${__ARCH}" @@ -301,12 +307,6 @@ fetch fetch-list extract patch configure build install reinstall package describ @echo "and you are running ${MACHINE_ARCH}." .else -# Get the architecture -ARCH!= uname -m - -# Get the operating system type -OPSYS!= uname -s - .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" .endif @@ -1834,7 +1834,7 @@ tags: .endif -# generate ${PLIST} from ${PKGDIR}/PLIST, by +# generate ${PLIST} from ${PLIST_SRC} by: # - fixing list of man-pages according to MANCOMPRESSED/MANZ # (we don't regard MANCOMPRESSED as many ports seem to have .gz pages in # PLIST even when they install manpages without compressing them) @@ -1861,7 +1861,7 @@ PLIST_SRC= ${PLIST}: ${PLIST_SRC} @if [ -z "${PLIST_SRC}" ] ; then \ ${ECHO} "No ${PKGDIR}/PLIST, and no ${PKGDIR}/PLIST-{mi,md.shared,md.static}" ; \ - ${ECHO} "Package must care for making ${PLIST}!" ; \ + ${ECHO} "Package must care for making ${PLIST} by setting PLIST_SRC!" ; \ fi .if defined(MANZ) @if [ ! -z "${PLIST_SRC}" ] ; then \ diff --git a/mk/bsd.port.mk b/mk/bsd.port.mk index 0c66ceedf45..cd96542441e 100644 --- a/mk/bsd.port.mk +++ b/mk/bsd.port.mk @@ -1,7 +1,7 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $NetBSD: bsd.port.mk,v 1.23 1997/12/03 08:32:01 hubertf Exp $ +# $NetBSD: bsd.port.mk,v 1.24 1997/12/13 21:28:24 hubertf Exp $ # # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. @@ -283,6 +283,12 @@ NetBSD_MAINTAINER= agc@netbsd.org # NEVER override the "regular" targets unless you want to open # a major can of worms. +# Get the architecture +ARCH!= uname -m + +# Get the operating system type +OPSYS!= uname -s + .if defined(ONLY_FOR_ARCHS) .for __ARCH in ${ONLY_FOR_ARCHS} .if ${MACHINE_ARCH} == "${__ARCH}" @@ -301,12 +307,6 @@ fetch fetch-list extract patch configure build install reinstall package describ @echo "and you are running ${MACHINE_ARCH}." .else -# Get the architecture -ARCH!= uname -m - -# Get the operating system type -OPSYS!= uname -s - .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" .endif @@ -1834,7 +1834,7 @@ tags: .endif -# generate ${PLIST} from ${PKGDIR}/PLIST, by +# generate ${PLIST} from ${PLIST_SRC} by: # - fixing list of man-pages according to MANCOMPRESSED/MANZ # (we don't regard MANCOMPRESSED as many ports seem to have .gz pages in # PLIST even when they install manpages without compressing them) @@ -1861,7 +1861,7 @@ PLIST_SRC= ${PLIST}: ${PLIST_SRC} @if [ -z "${PLIST_SRC}" ] ; then \ ${ECHO} "No ${PKGDIR}/PLIST, and no ${PKGDIR}/PLIST-{mi,md.shared,md.static}" ; \ - ${ECHO} "Package must care for making ${PLIST}!" ; \ + ${ECHO} "Package must care for making ${PLIST} by setting PLIST_SRC!" ; \ fi .if defined(MANZ) @if [ ! -z "${PLIST_SRC}" ] ; then \ |