From 87e1bea888d90a6044a18e46681bc456ea30305c Mon Sep 17 00:00:00 2001 From: rillig Date: Sun, 7 Jan 2007 09:13:46 +0000 Subject: Mechanically replaced man/* with ${PKGMANDIR}/* in the definition of INSTALLATION_DIRS, as well as all occurrences of ${PREFIX}/man with ${PREFIX}/${PKGMANDIR}. Fixes PR 35265, although I did not use the patch provided therein. --- inputmethod/canna-canuum/Makefile | 4 ++-- inputmethod/skkfep/Makefile | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'inputmethod') diff --git a/inputmethod/canna-canuum/Makefile b/inputmethod/canna-canuum/Makefile index 49ed75350fe..f290204df70 100644 --- a/inputmethod/canna-canuum/Makefile +++ b/inputmethod/canna-canuum/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/07/05 04:48:28 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2007/01/07 09:13:56 rillig Exp $ PKGREVISION= 1 CANNA_MODULE= canuum @@ -9,7 +9,7 @@ MAINTAINER= oishi@ims.ac.jp MAKE_ARGS+= PREFIX=${PREFIX} -INSTALLATION_DIRS= man/ja_JP.EUC/man1 +INSTALLATION_DIRS= ${PKGMANDIR}/ja_JP.EUC/man1 CONFIGURE_DIRS= ${WRKSRC} ${WRKSRC}/canuum BUILD_DIRS= ${WRKSRC}/canuum diff --git a/inputmethod/skkfep/Makefile b/inputmethod/skkfep/Makefile index b7fbb36e0cd..00d0e3e9950 100644 --- a/inputmethod/skkfep/Makefile +++ b/inputmethod/skkfep/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/03/04 21:29:53 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2007/01/07 09:13:56 rillig Exp $ DISTNAME= skkfep0.86c PKGNAME= skkfep-0.86c @@ -16,13 +16,13 @@ WRKSRC= ${WRKDIR}/skkfep NO_CONFIGURE= yes MAKE_ENV+= MAKE_FLAGS=EXECBASE=${LOCALBASE:Q}\ CC=${CC:Q} -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 CONF_FILES+= ${PREFIX}/share/examples/skk/skk.conf ${PKG_SYSCONFDIR}/skk.conf do-install: ${INSTALL_PROGRAM} ${WRKSRC}/skkfep ${PREFIX}/bin/skkfep - ${INSTALL_MAN} ${WRKSRC}/skkfep.1 ${PREFIX}/man/man1/skkfep.1 + ${INSTALL_MAN} ${WRKSRC}/skkfep.1 ${PREFIX}/${PKGMANDIR}/man1/skkfep.1 ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/skk ${INSTALL_DATA} ${FILESDIR}/skk.conf ${PREFIX}/share/examples/skk/skk.conf -- cgit v1.2.3