diff options
author | jperkin <jperkin@pkgsrc.org> | 2015-02-16 10:17:47 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2015-02-16 10:17:47 +0000 |
commit | 2dbf95923033e6706d8af86fe5e4f7120ab16b35 (patch) | |
tree | a161eca93b2f5a03aac62b2fd7b114bf22611e5a | |
parent | afb4ec50f89206ee4ab1ca897a36aaab0ec94e82 (diff) | |
download | pkgsrc-2dbf95923033e6706d8af86fe5e4f7120ab16b35.tar.gz |
Put back MESSAGE_SRC_DFLT.
-rw-r--r-- | mk/pkgformat/pkg/metadata.mk | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/mk/pkgformat/pkg/metadata.mk b/mk/pkgformat/pkg/metadata.mk index ee613fcbf00..6327452ab8d 100644 --- a/mk/pkgformat/pkg/metadata.mk +++ b/mk/pkgformat/pkg/metadata.mk @@ -1,4 +1,4 @@ -# $NetBSD: metadata.mk,v 1.10 2015/02/02 12:32:49 obache Exp $ +# $NetBSD: metadata.mk,v 1.11 2015/02/16 10:17:47 jperkin Exp $ ###################################################################### ### The targets below are all PRIVATE. @@ -207,26 +207,25 @@ ${_DESCR_FILE}: ${DESCR_SRC} ### This file contains important messages which apply to this package, ### and are shown during installation. ### -.if !defined(MESSAGE_SRC) -. if exists(${PKGDIR}/MESSAGE) -MESSAGE_SRC= ${PKGDIR}/MESSAGE -. else -. if exists(${PKGDIR}/MESSAGE.common) -MESSAGE_SRC= ${PKGDIR}/MESSAGE.common -. endif -. if exists(${PKGDIR}/MESSAGE.${OPSYS}) -MESSAGE_SRC+= ${PKGDIR}/MESSAGE.${OPSYS} -. endif -. if exists(${PKGDIR}/MESSAGE.${MACHINE_ARCH:C/i[3-6]86/i386/g}) -MESSAGE_SRC+= ${PKGDIR}/MESSAGE.${MACHINE_ARCH:C/i[3-6]86/i386/g} -. endif -. if exists(${PKGDIR}/MESSAGE.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g}) -MESSAGE_SRC+= ${PKGDIR}/MESSAGE.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g} -. endif +.if exists(${PKGDIR}/MESSAGE) +MESSAGE_SRC_DFLT= ${PKGDIR}/MESSAGE +.else +. if exists(${PKGDIR}/MESSAGE.common) +MESSAGE_SRC_DFLT= ${PKGDIR}/MESSAGE.common +. endif +. if exists(${PKGDIR}/MESSAGE.${OPSYS}) +MESSAGE_SRC_DFLT+= ${PKGDIR}/MESSAGE.${OPSYS} +. endif +. if exists(${PKGDIR}/MESSAGE.${MACHINE_ARCH:C/i[3-6]86/i386/g}) +MESSAGE_SRC_DFLT+= ${PKGDIR}/MESSAGE.${MACHINE_ARCH:C/i[3-6]86/i386/g} +. endif +. if exists(${PKGDIR}/MESSAGE.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g}) +MESSAGE_SRC_DFLT+= ${PKGDIR}/MESSAGE.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g} . endif .endif +MESSAGE_SRC?= ${MESSAGE_SRC_DFLT} -.if defined(MESSAGE_SRC) +.if !empty(MESSAGE_SRC) _MESSAGE_FILE= ${PKG_DB_TMPDIR}/+DISPLAY _METADATA_TARGETS+= ${_MESSAGE_FILE} |