diff options
| author | jlam <jlam> | 2003-08-30 23:05:03 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-08-30 23:05:03 +0000 |
| commit | f4a96854aaccfa035198250b708391209ef28de6 (patch) | |
| tree | 8537668bcf78d9ab4ecc20d95f7efb90ce5569e7 | |
| parent | cc48fe3ca558668fabaa51a27114deb879c302ae (diff) | |
| download | pkgsrc-f4a96854aaccfa035198250b708391209ef28de6.tar.gz | |
Sync to HEAD.
| -rw-r--r-- | mk/bsd.pkg.install.mk | 11 | ||||
| -rw-r--r-- | mk/bsd.pkg.mk | 2 | ||||
| -rw-r--r-- | mk/install/header | 3 |
3 files changed, 5 insertions, 11 deletions
diff --git a/mk/bsd.pkg.install.mk b/mk/bsd.pkg.install.mk index f6f25e2fa5b..cd71f07af4c 100644 --- a/mk/bsd.pkg.install.mk +++ b/mk/bsd.pkg.install.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.install.mk,v 1.40.4.3 2003/08/01 19:00:27 jlam Exp $ +# $NetBSD: bsd.pkg.install.mk,v 1.40.4.4 2003/08/30 23:05:03 jlam Exp $ # # This Makefile fragment is included by package Makefiles to use the common # INSTALL/DEINSTALL scripts. To use this Makefile fragment, simply: @@ -30,18 +30,10 @@ HEADER_EXTRA_TMPL?= ${.CURDIR}/HEADER .else HEADER_EXTRA_TMPL?= # empty .endif -.if !defined(DEINSTALL_EXTRA_TMPL) && exists(${.CURDIR}/DEINSTALL) -DEINSTALL_EXTRA_TMPL?= ${.CURDIR}/DEINSTALL -.else DEINSTALL_EXTRA_TMPL?= # empty -.endif DEINSTALL_TMPL?= ${.CURDIR}/../../mk/install/deinstall INSTALL_TMPL?= ${.CURDIR}/../../mk/install/install -.if !defined(INSTALL_EXTRA_TMPL) && exists(${.CURDIR}/INSTALL) -INSTALL_EXTRA_TMPL?= ${.CURDIR}/INSTALL -.else INSTALL_EXTRA_TMPL?= # empty -.endif _FOOTER_TMPL?= ${.CURDIR}/../../mk/install/footer # DEINSTALL_TEMPLATES and INSTALL_TEMPLATES are the default list of source @@ -269,6 +261,7 @@ FILES_SUBST+= SETENV=${SETENV:Q} FILES_SUBST+= SH=${SH:Q} FILES_SUBST+= SORT=${SORT:Q} FILES_SUBST+= SU=${SU:Q} +FILES_SUBST+= TEST=${TEST:Q} FILES_SUBST+= TOUCH=${TOUCH:Q} FILES_SUBST+= TR=${TR:Q} FILES_SUBST+= TRUE=${TRUE:Q} diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index caf702a24ab..499049ae8bd 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1216.2.46 2003/08/30 13:33:12 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1216.2.47 2003/08/30 23:05:03 jlam Exp $ # # This file is in the public domain. # diff --git a/mk/install/header b/mk/install/header index 049a1d67e94..581e96c9766 100644 --- a/mk/install/header +++ b/mk/install/header @@ -2,7 +2,7 @@ # # start of header # -# $NetBSD: header,v 1.17.4.3 2003/07/30 10:04:31 jlam Exp $ +# $NetBSD: header,v 1.17.4.4 2003/08/30 23:05:06 jlam Exp $ PKGNAME=$1 STAGE=$2 @@ -38,6 +38,7 @@ SETENV="@SETENV@" SH="@SH@" SORT="@SORT@" SU="@SU@" +TEST="@TEST@" TOUCH="@TOUCH@" TR="@TR@" TRUE="@TRUE@" |