diff options
| author | tron <tron> | 1998-02-28 10:39:19 +0000 |
|---|---|---|
| committer | tron <tron> | 1998-02-28 10:39:19 +0000 |
| commit | 17d64f90b655bb6eec27e755b9be4f58c36dffd3 (patch) | |
| tree | 7bf79cb7df191489f829758776866a23a2fcc98a /mk | |
| parent | 247fda7026f2c1121e24578bc64b0f139b2472e5 (diff) | |
| download | pkgsrc-17d64f90b655bb6eec27e755b9be4f58c36dffd3.tar.gz | |
Fix merge problem with last commit.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 10 | ||||
| -rw-r--r-- | mk/bsd.port.mk | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index eb9c2825dec..f7b9c1e8ae0 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,7 +1,7 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $NetBSD: bsd.pkg.mk,v 1.51 1998/02/28 10:14:41 tron Exp $ +# $NetBSD: bsd.pkg.mk,v 1.52 1998/02/28 10:39:19 tron Exp $ # # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. @@ -1983,24 +1983,24 @@ ${PLIST}: ${PLIST_SRC} ${ECHO} "No ${PKGDIR}/PLIST, and no ${PKGDIR}/PLIST-{mi,md.shared,md.static}" ; \ ${ECHO} "Package must care for making ${PLIST} by setting PLIST_SRC!" ; \ fi - -e '/man\/${MANLANG}\/man.*[^g][^z]$$/s/$$/.gz/' \ - -e '/man\/${MANLANG}\/cat.*[^g][^z]$$/s/$$/.gz/' \ .if defined(MANZ) @if [ ! -z "${PLIST_SRC}" ] ; then \ ${CAT} ${PLIST_SRC} | ${SED} \ -e '/man\/man.*[^g][^z]$$/s/$$/.gz/' \ -e '/man\/cat.*[^g][^z]$$/s/$$/.gz/' \ + -e '/man\/${MANLANG}\/man.*[^g][^z]$$/s/$$/.gz/' \ + -e '/man\/${MANLANG}\/cat.*[^g][^z]$$/s/$$/.gz/' \ -e 's/<\$$ARCH>/'${ARCH}'/g' \ -e 's/\$${MACHINE_ARCH}/'${MACHINE_ARCH}'/g' \ >${PLIST} ; \ fi - -e '/man\/${MANLANG}\/man.*[^g][^z]$$/s/$$/.gz/' \ - -e '/man\/${MANLANG}\/cat.*[^g][^z]$$/s/$$/.gz/' \ .else # !MANZ @if [ ! -z "${PLIST_SRC}" ] ; then \ ${CAT} ${PLIST_SRC} | ${SED} \ -e '/man\/man/s/\.gz$$//' \ -e '/man\/cat/s/\.gz$$//' \ + -e '/man\/${MANLANG}\/man/s/\.gz$$//' \ + -e '/man\/${MANLANG}\/cat/s/\.gz$$//' \ -e 's/<\$$ARCH>/'${ARCH}'/g' \ -e 's/\$${MACHINE_ARCH}/'${MACHINE_ARCH}'/g' \ >${PLIST} ; \ diff --git a/mk/bsd.port.mk b/mk/bsd.port.mk index 84506bb1290..f88d433395c 100644 --- a/mk/bsd.port.mk +++ b/mk/bsd.port.mk @@ -1,7 +1,7 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $NetBSD: bsd.port.mk,v 1.51 1998/02/28 10:14:41 tron Exp $ +# $NetBSD: bsd.port.mk,v 1.52 1998/02/28 10:39:19 tron Exp $ # # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. @@ -1983,24 +1983,24 @@ ${PLIST}: ${PLIST_SRC} ${ECHO} "No ${PKGDIR}/PLIST, and no ${PKGDIR}/PLIST-{mi,md.shared,md.static}" ; \ ${ECHO} "Package must care for making ${PLIST} by setting PLIST_SRC!" ; \ fi - -e '/man\/${MANLANG}\/man.*[^g][^z]$$/s/$$/.gz/' \ - -e '/man\/${MANLANG}\/cat.*[^g][^z]$$/s/$$/.gz/' \ .if defined(MANZ) @if [ ! -z "${PLIST_SRC}" ] ; then \ ${CAT} ${PLIST_SRC} | ${SED} \ -e '/man\/man.*[^g][^z]$$/s/$$/.gz/' \ -e '/man\/cat.*[^g][^z]$$/s/$$/.gz/' \ + -e '/man\/${MANLANG}\/man.*[^g][^z]$$/s/$$/.gz/' \ + -e '/man\/${MANLANG}\/cat.*[^g][^z]$$/s/$$/.gz/' \ -e 's/<\$$ARCH>/'${ARCH}'/g' \ -e 's/\$${MACHINE_ARCH}/'${MACHINE_ARCH}'/g' \ >${PLIST} ; \ fi - -e '/man\/${MANLANG}\/man.*[^g][^z]$$/s/$$/.gz/' \ - -e '/man\/${MANLANG}\/cat.*[^g][^z]$$/s/$$/.gz/' \ .else # !MANZ @if [ ! -z "${PLIST_SRC}" ] ; then \ ${CAT} ${PLIST_SRC} | ${SED} \ -e '/man\/man/s/\.gz$$//' \ -e '/man\/cat/s/\.gz$$//' \ + -e '/man\/${MANLANG}\/man/s/\.gz$$//' \ + -e '/man\/${MANLANG}\/cat/s/\.gz$$//' \ -e 's/<\$$ARCH>/'${ARCH}'/g' \ -e 's/\$${MACHINE_ARCH}/'${MACHINE_ARCH}'/g' \ >${PLIST} ; \ |