From 8f689ca03ac630d3d63991fbe8fa1d8d8632c3f3 Mon Sep 17 00:00:00 2001 From: matthieu Date: Fri, 1 Jun 2007 01:05:25 +0000 Subject: [PATCH] Only run fc-cache once at the end of fonts installation. --- font/Makefile | 8 +++++++- font/Makefile.inc | 5 +++++ font/bitstream-vera-ttf/Makefile | 3 +-- 3 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 font/Makefile.inc diff --git a/font/Makefile b/font/Makefile index c5f3cb4cb..a9094feda 100644 --- a/font/Makefile +++ b/font/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2006/12/17 19:52:56 matthieu Exp $ +# $OpenBSD: Makefile,v 1.3 2007/06/01 01:05:25 matthieu Exp $ # util must come 1st, alias must come last SUBDIR= util encodings \ @@ -15,6 +15,12 @@ SUBDIR= util encodings \ EXTRAS= bitstream-vera-ttf +afterinstall: + @if test -z "$(DESTDIR)"; then \ + echo "running fc-cache";\ + fc-cache -s -v ;\ + fi + .include build: _SUBDIRUSE diff --git a/font/Makefile.inc b/font/Makefile.inc new file mode 100644 index 000000000..e7cceb34e --- /dev/null +++ b/font/Makefile.inc @@ -0,0 +1,5 @@ +# $OpenBSD: Makefile.inc,v 1.1 2007/06/01 01:05:25 matthieu Exp $ + +realinstall: + exec ${MAKE} install FCCACHE=: + diff --git a/font/bitstream-vera-ttf/Makefile b/font/bitstream-vera-ttf/Makefile index 9569ff4cc..4f6747338 100644 --- a/font/bitstream-vera-ttf/Makefile +++ b/font/bitstream-vera-ttf/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2007/03/31 16:41:11 matthieu Exp $ +# $OpenBSD: Makefile,v 1.3 2007/06/01 01:05:25 matthieu Exp $ FONT_FILES= \ Vera.ttf \ @@ -31,6 +31,5 @@ install: mkfontscale ${DESTDIR}${fontdir} @rm -f ${DESTDIR}${fontdir}/fonts.dir mkfontdir ${DESTDIR}${fontdir} - fc-cache -v ${DESTDIR}${fontdir} .include