From 7acef1cd7a4173168980125b140340c62b38c8d6 Mon Sep 17 00:00:00 2001 From: Satoshi Asami Date: Sun, 8 Oct 2000 10:23:48 +0000 Subject: Change PKGDIR from pkg/ to . Also fix places where ${PKGDIR} is spelled out (many of which are ${PKGDIR}/MESSAGE -> ${PKGMESSAGE} type fixes that shouldn't have been necessary) and the string "/pkg/" appear. --- chinese/FreeWnn-lib/Makefile | 2 +- chinese/FreeWnn-server/Makefile | 4 ++-- chinese/arphicttf/Makefile | 2 +- chinese/moefonts-cid/Makefile | 2 +- chinese/moettf/Makefile | 2 +- chinese/mule-freewnn/Makefile | 2 +- chinese/nvi-big5/Makefile | 2 +- chinese/nvi-euc-cn/Makefile | 2 +- chinese/nvi-euc-tw/Makefile | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) (limited to 'chinese') diff --git a/chinese/FreeWnn-lib/Makefile b/chinese/FreeWnn-lib/Makefile index 4ff48ce7d363..f74cfcff324d 100644 --- a/chinese/FreeWnn-lib/Makefile +++ b/chinese/FreeWnn-lib/Makefile @@ -8,7 +8,7 @@ PKGNAMESUFFIX= -lib CATEGORIES= chinese MASTERDIR= ${.CURDIR}/../../japanese/FreeWnn-lib -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} WNN= cWnn .include "${MASTERDIR}/Makefile" diff --git a/chinese/FreeWnn-server/Makefile b/chinese/FreeWnn-server/Makefile index 538297254026..0cb2f7d2b7ea 100644 --- a/chinese/FreeWnn-server/Makefile +++ b/chinese/FreeWnn-server/Makefile @@ -8,8 +8,8 @@ PKGNAMESUFFIX= -server CATEGORIES= chinese MASTERDIR= ${.CURDIR}/../../japanese/FreeWnn-lib -PKGDIR= ${.CURDIR}/pkg -PKGINSTALL= ${.CURDIR}/../../japanese/FreeWnn-server/pkg/INSTALL +PKGDIR= ${.CURDIR} +PKGINSTALL= ${.CURDIR}/../../japanese/FreeWnn-server/pkg-install WNN= cWnn .include "${MASTERDIR}/Makefile" diff --git a/chinese/arphicttf/Makefile b/chinese/arphicttf/Makefile index 757085bb3e09..2fb8a3ec4925 100644 --- a/chinese/arphicttf/Makefile +++ b/chinese/arphicttf/Makefile @@ -40,6 +40,6 @@ do-install: @${MKDIR} ${FONTDIR}/arphic @${CP} -fr ${WRKSRC}/license ${FONTDIR}/arphic @${CP} -f ${WRKSRC}/logo.gif ${WRKSRC}/release.txt ${FONTDIR}/arphic - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include diff --git a/chinese/moefonts-cid/Makefile b/chinese/moefonts-cid/Makefile index ae7847c14b1e..8bb0e4297d46 100644 --- a/chinese/moefonts-cid/Makefile +++ b/chinese/moefonts-cid/Makefile @@ -38,6 +38,6 @@ do-install: ${PREFIX}/share/ghostscript/fonts/CMap @${INSTALL_DATA} ${WRKDIR}/ag13/CMap/* \ ${PREFIX}/share/ghostscript/fonts/CMap - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include diff --git a/chinese/moettf/Makefile b/chinese/moettf/Makefile index 28423a6de795..922f5ddf4f2b 100644 --- a/chinese/moettf/Makefile +++ b/chinese/moettf/Makefile @@ -46,6 +46,6 @@ do-install: @${INSTALL_DATA} ${WRKDIR}/moe_lishu.ttf ${FONTDIR} @${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/moe_kai.ttf ${FONTDIR} @${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/moe_sung.ttf ${FONTDIR} - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include diff --git a/chinese/mule-freewnn/Makefile b/chinese/mule-freewnn/Makefile index 9bec815a8882..d4f2025a6085 100644 --- a/chinese/mule-freewnn/Makefile +++ b/chinese/mule-freewnn/Makefile @@ -9,7 +9,7 @@ CATEGORIES= chinese PKGNAMESUFFIX= -freewnn MASTERDIR= ${.CURDIR}/../../editors/mule -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} CFREEWNN= yes diff --git a/chinese/nvi-big5/Makefile b/chinese/nvi-big5/Makefile index 6301b73504ef..9163b3b50e34 100644 --- a/chinese/nvi-big5/Makefile +++ b/chinese/nvi-big5/Makefile @@ -12,7 +12,7 @@ MASTERDIR= ${.CURDIR}/../../editors/nvi-m17n MAINTAINER= itojun@itojun.org -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment CONFIGURE_ARGS+= --enable-multibyte=big5 --program-prefix=n .include "${MASTERDIR}/Makefile" diff --git a/chinese/nvi-euc-cn/Makefile b/chinese/nvi-euc-cn/Makefile index d94d42445122..59737eb370f5 100644 --- a/chinese/nvi-euc-cn/Makefile +++ b/chinese/nvi-euc-cn/Makefile @@ -13,6 +13,6 @@ MAINTAINER= itojun@itojun.org CONFIGURE_ARGS+= --enable-multibyte=euc-cn --program-prefix=n MASTERDIR= ${.CURDIR}/../../editors/nvi-m17n -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment .include "${MASTERDIR}/Makefile" diff --git a/chinese/nvi-euc-tw/Makefile b/chinese/nvi-euc-tw/Makefile index 1f277c50ef76..0679bffe08a6 100644 --- a/chinese/nvi-euc-tw/Makefile +++ b/chinese/nvi-euc-tw/Makefile @@ -13,6 +13,6 @@ MAINTAINER= itojun@itojun.org CONFIGURE_ARGS+= --enable-multibyte=euc-tw --program-prefix=n MASTERDIR= ${.CURDIR}/../../editors/nvi-m17n -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment .include "${MASTERDIR}/Makefile" -- cgit v1.2.3