diff options
| author | jlam <jlam@pkgsrc.org> | 2003-08-30 22:53:39 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2003-08-30 22:53:39 +0000 |
| commit | d505acc9c8b3bdd98897289dc672f663797f7f35 (patch) | |
| tree | 6f51657139061d6c1ecbe6945a97fd30ce6ae93a /mk/bsd.pkg.install.mk | |
| parent | b2677a2cb0d685822071dbac41558e75e1bc7c6a (diff) | |
| download | pkgsrc-d505acc9c8b3bdd98897289dc672f663797f7f35.tar.gz | |
No longer assume that a DEINSTALL/INSTALL script in the package directory
is meant for {,DE}INSTALL_EXTRA_TMPL. Package makefiles should explicitly
set those variables if they want to use them in conjunction with
USE_PKGINSTALL.
Diffstat (limited to 'mk/bsd.pkg.install.mk')
| -rw-r--r-- | mk/bsd.pkg.install.mk | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/mk/bsd.pkg.install.mk b/mk/bsd.pkg.install.mk index cd2e3d89e06..699538ebf94 100644 --- a/mk/bsd.pkg.install.mk +++ b/mk/bsd.pkg.install.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.install.mk,v 1.44 2003/08/30 18:42:36 jlam Exp $ +# $NetBSD: bsd.pkg.install.mk,v 1.45 2003/08/30 22:53:39 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 |