[pkgsrc/trunk]: pkgsrc/mk No longer assume that a DEINSTALL/INSTALL script in...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5ab4d1643a3f
branches:  trunk
changeset: 460490:5ab4d1643a3f
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Aug 30 22:53:39 2003 +0000

description:
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:

 mk/bsd.pkg.install.mk |  10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)

diffs (28 lines):

diff -r ef2f1143499c -r 5ab4d1643a3f mk/bsd.pkg.install.mk
--- a/mk/bsd.pkg.install.mk     Sat Aug 30 22:51:11 2003 +0000
+++ b/mk/bsd.pkg.install.mk     Sat Aug 30 22:53:39 2003 +0000
@@ -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 @@
 .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