diff options
| author | jlam <jlam@pkgsrc.org> | 2003-11-23 07:14:43 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2003-11-23 07:14:43 +0000 |
| commit | 62fd86d085d1f447ecc060d66e32f9f52cb43566 (patch) | |
| tree | c208aee6f38a73fe2cc0863c78bf9907c1b269e6 /mk/bsd.pkg.install.mk | |
| parent | 0b5611d5d1b291f65e93013e4c48bb2aaae58c67 (diff) | |
| download | pkgsrc-62fd86d085d1f447ecc060d66e32f9f52cb43566.tar.gz | |
In the overwrite package case:
* Ensure that VIEW-INSTALL is called after _all_ POST-INSTALL actions
(including any in the INSTALL_EXTRA_TMPL file) by moving the call to
a file that is included after all other INSTALL templates.
* Ensure that VIEW-DEINSTALL is called before _all_ DEINSTALL actions
(including any in the DEINSTALL_EXTRA_TMPL file) by moving the call to
a file that is included before all other DEINSTALL templates.
Diffstat (limited to 'mk/bsd.pkg.install.mk')
| -rw-r--r-- | mk/bsd.pkg.install.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mk/bsd.pkg.install.mk b/mk/bsd.pkg.install.mk index 63aba11b8a3..9d670a0fb62 100644 --- a/mk/bsd.pkg.install.mk +++ b/mk/bsd.pkg.install.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.install.mk,v 1.52 2003/09/17 02:38:22 jlam Exp $ +# $NetBSD: bsd.pkg.install.mk,v 1.53 2003/11/23 07:14:43 jlam Exp $ # # This Makefile fragment is included by package Makefiles to use the common # INSTALL/DEINSTALL scripts. To use this Makefile fragment, simply: @@ -30,10 +30,12 @@ HEADER_EXTRA_TMPL?= ${.CURDIR}/HEADER .else HEADER_EXTRA_TMPL?= # empty .endif +DEINSTALL_PRE_TMPL?= ${.CURDIR}/../../mk/install/deinstall-pre DEINSTALL_EXTRA_TMPL?= # empty DEINSTALL_TMPL?= ${.CURDIR}/../../mk/install/deinstall INSTALL_TMPL?= ${.CURDIR}/../../mk/install/install INSTALL_EXTRA_TMPL?= # empty +INSTALL_POST_TMPL?= ${.CURDIR}/../../mk/install/install-post _FOOTER_TMPL?= ${.CURDIR}/../../mk/install/footer # DEINSTALL_TEMPLATES and INSTALL_TEMPLATES are the default list of source @@ -41,6 +43,7 @@ _FOOTER_TMPL?= ${.CURDIR}/../../mk/install/footer # DEINSTALL_TEMPLATES= ${_HEADER_TMPL} DEINSTALL_TEMPLATES+= ${HEADER_EXTRA_TMPL} +DEINSTALL_TEMPLATES+= ${DEINSTALL_PRE_TMPL} DEINSTALL_TEMPLATES+= ${DEINSTALL_EXTRA_TMPL} DEINSTALL_TEMPLATES+= ${DEINSTALL_TMPL} DEINSTALL_TEMPLATES+= ${_FOOTER_TMPL} @@ -48,6 +51,7 @@ INSTALL_TEMPLATES= ${_HEADER_TMPL} INSTALL_TEMPLATES+= ${HEADER_EXTRA_TMPL} INSTALL_TEMPLATES+= ${INSTALL_TMPL} INSTALL_TEMPLATES+= ${INSTALL_EXTRA_TMPL} +INSTALL_TEMPLATES+= ${INSTALL_POST_TMPL} INSTALL_TEMPLATES+= ${_FOOTER_TMPL} # These are the list of source files that are concatenated to form the |