From 08d059a3926b00e5316fcbf2c804fc1ab245813a Mon Sep 17 00:00:00 2001 From: jperkin Date: Thu, 12 Sep 2013 11:18:40 +0000 Subject: Use CATMAN_SECTION_SUFFIX in packages which perform their own catman page installation. --- net/tnftp/Makefile | 3 ++- net/tnftp/files/src/Makefile.in | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'net/tnftp') diff --git a/net/tnftp/Makefile b/net/tnftp/Makefile index d8614fdb1ad..e45b6f3ecd5 100644 --- a/net/tnftp/Makefile +++ b/net/tnftp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2013/07/15 02:02:27 ryoon Exp $ +# $NetBSD: Makefile,v 1.33 2013/09/12 11:18:40 jperkin Exp $ DISTNAME= tnftp-20070806 SVR4_PKGNAME= tnftp @@ -23,6 +23,7 @@ CHECK_PERMS= no OPSYSVARS+= MAKE_ENV MAKE_ENV.SunOS+= CPPFLAGS="" +MAKE_ENV+= CATMAN_SECTION_SUFFIX=${CATMAN_SECTION_SUFFIX:Q} MAKE_ENV+= MANINSTALL=${MANINSTALL:Q} .include "options.mk" diff --git a/net/tnftp/files/src/Makefile.in b/net/tnftp/files/src/Makefile.in index 59756faa66f..533adbfa77a 100644 --- a/net/tnftp/files/src/Makefile.in +++ b/net/tnftp/files/src/Makefile.in @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.in,v 1.7 2012/03/04 19:49:41 joerg Exp $ +# $NetBSD: Makefile.in,v 1.8 2013/09/12 11:18:40 jperkin Exp $ # srcdir = @srcdir@ @@ -44,7 +44,11 @@ install: all ${INSTALL} -m 555 ${PROG} ${DESTDIR}${bindir}/`echo ${PROG}|sed '$(transform)'` .if !empty(MANINSTALL:Mcatinstall) -mkdir -p ${DESTDIR}${mandircat1} +. if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss]) + ${INSTALL} -m 444 ${srcdir}/${PROG}.cat1 ${DESTDIR}${mandircat1}/`echo ${PROG}|sed '$(transform)'`.1 +. else ${INSTALL} -m 444 ${srcdir}/${PROG}.cat1 ${DESTDIR}${mandircat1}/`echo ${PROG}|sed '$(transform)'`.0 +. endif .endif clean: -- cgit v1.2.3