From e811379bc2842dd164f9f6ad4726e3f22eaab1e2 Mon Sep 17 00:00:00 2001 From: jlam Date: Thu, 15 Jun 2006 22:13:58 +0000 Subject: Pluralize INSTALL_TEMPLATE and DEINSTALL_TEMPLATE variable names as per the pkglint warning: As {INSTALL,DEINSTALL}_TEMPLATE is modified using "+=", its name should indicate plural. This does make the variables a bit more suggestive of the fact that they hold lists of values. --- lang/sun-jre15/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lang/sun-jre15') diff --git a/lang/sun-jre15/Makefile b/lang/sun-jre15/Makefile index c1cbc827ba9..2a8dc7d030c 100644 --- a/lang/sun-jre15/Makefile +++ b/lang/sun-jre15/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2006/05/28 02:24:49 tv Exp $ +# $NetBSD: Makefile,v 1.33 2006/06/15 22:13:59 jlam Exp $ # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce @@ -28,9 +28,9 @@ PKG_SUPPORTED_OPTIONS= sun-jre-jce .include "../../mk/bsd.options.mk" -HEADER_TEMPLATE+= ${WRKDIR}/HEADER.tmpl -INSTALL_TEMPLATE+= ${PKGDIR}/INSTALL.tmpl -DEINSTALL_TEMPLATE+= ${PKGDIR}/DEINSTALL.tmpl +HEADER_TEMPLATES+= ${WRKDIR}/HEADER.tmpl +INSTALL_TEMPLATES+= ${PKGDIR}/INSTALL.tmpl +DEINSTALL_TEMPLATES+= ${PKGDIR}/DEINSTALL.tmpl FILES_SUBST+= JAVA_HOME=${JAVA_HOME:Q} FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH:Q} @@ -52,7 +52,7 @@ do-configure: cd ${WRKSRC}/lib; for file in ${SFILES}; do \ ${MV} -f $$file $$file.default; \ done - @${ECHO} 'CONF_FILES="${CONF_FILES}"' >${HEADER_TEMPLATE} + @${ECHO} 'CONF_FILES="${CONF_FILES}"' >${WRKDIR}/HEADER.tmpl pre-install: .if !empty(PKG_OPTIONS:Msun-jre-jce) -- cgit v1.2.3