summaryrefslogtreecommitdiff
path: root/mk/fonts.mk
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2003-12-19 23:46:41 +0000
committerjmmv <jmmv@pkgsrc.org>2003-12-19 23:46:41 +0000
commit456a588def486650703342bf65d299728bdb2b03 (patch)
treed02e3529c86a9b245871698de6db8a4768fe0a17 /mk/fonts.mk
parent4f1bd3ab2187f8a6f61797997baa2ab14a0d7b67 (diff)
downloadpkgsrc-456a588def486650703342bf65d299728bdb2b03.tar.gz
Handle font (de)installation before bsd.pkg.install.mk handles OWN_DIRS.
This way font directories are not automatically removed; the package must define OWN_DIRS if it wants them to be deleted during deinstallation. This is done to avoid removal of standard font directories (those that appear in *.dist files).
Diffstat (limited to 'mk/fonts.mk')
-rw-r--r--mk/fonts.mk5
1 files changed, 2 insertions, 3 deletions
diff --git a/mk/fonts.mk b/mk/fonts.mk
index 0ca7103c388..bf39569b34b 100644
--- a/mk/fonts.mk
+++ b/mk/fonts.mk
@@ -1,4 +1,4 @@
-# $NetBSD: fonts.mk,v 1.3 2003/02/18 17:51:08 jmmv Exp $
+# $NetBSD: fonts.mk,v 1.4 2003/12/19 23:46:41 jmmv Exp $
#
# This Makefile fragment is intended to be included by packages that install
# fonts (most of them in the fonts category). It takes care of updating the
@@ -25,8 +25,7 @@ FONTS_X11_DIRS?=
.if !empty(FONTS_TTF_DIRS) || !empty(FONTS_TYPE1_DIRS) || !empty(FONTS_X11_DIRS)
USE_PKGINSTALL= YES
-INSTALL_EXTRA_TMPL+= ${.CURDIR}/../../mk/install/fonts
-DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/../../mk/install/fonts
+HEADER_EXTRA_TMPL+= ${.CURDIR}/../../mk/install/fonts
.if !empty(FONTS_TTF_DIRS)
EVAL_PREFIX+= TTMKFDIR_PREFIX=ttmkfdir