From 3ead1854e79fa548eef620b804bf5b3d823c941e Mon Sep 17 00:00:00 2001 From: jlam Date: Thu, 28 Apr 2005 23:23:41 +0000 Subject: Avoid using != to define LOWER_PAPERSIZE .. use :sh instead to defer it until the make targets are invoked. This avoids needing ${ECHO} and ${TR} in the top-level make. --- print/teTeX-bin/Makefile | 5 +++-- print/teTeX3-bin/Makefile | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'print') diff --git a/print/teTeX-bin/Makefile b/print/teTeX-bin/Makefile index 05aa155c482..19b42f90e37 100644 --- a/print/teTeX-bin/Makefile +++ b/print/teTeX-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.62 2005/03/01 23:03:04 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.63 2005/04/28 23:23:41 jlam Exp $ DISTNAME= tetex-src-${TETEX_BIN_VERS} PKGNAME= teTeX-bin-${TETEX_BIN_VERS} @@ -40,7 +40,8 @@ LDFLAGS+= -lgcc_s .endif .if defined(PAPERSIZE) -LOWER_PAPERSIZE!= ${ECHO} ${PAPERSIZE} | ${TR} '[A-Z]' '[a-z]' +LOWER_PAPERSIZE_cmd= ${ECHO} ${PAPERSIZE:Q} | ${TR} '[A-Z]' '[a-z]' +LOWER_PAPERSIZE= ${LOWER_PAPERSIZE_cmd:sh} .endif post-install: diff --git a/print/teTeX3-bin/Makefile b/print/teTeX3-bin/Makefile index 9bd95395f97..4a66e056ba4 100644 --- a/print/teTeX3-bin/Makefile +++ b/print/teTeX3-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/04/10 21:52:37 schwarz Exp $ +# $NetBSD: Makefile,v 1.5 2005/04/28 23:25:14 jlam Exp $ DISTNAME= tetex-src-3.0 PKGNAME= ${DISTNAME:C/tetex/teTeX/:C/src/bin/} @@ -25,7 +25,8 @@ REPLACE_PERL= texk/xdvik/t1mapper \ CONFIGURE_ARGS+= --without-texinfo --without-texi2html .if defined(PAPERSIZE) -LOWER_PAPERSIZE!= ${ECHO} ${PAPERSIZE} | ${TR} '[A-Z]' '[a-z]' +LOWER_PAPERSIZE_cmd= ${ECHO} ${PAPERSIZE} | ${TR} '[A-Z]' '[a-z]' +LOWER_PAPERSIZE= ${LOWER_PAPERSIZE_cmd:sh} .endif post-install: -- cgit v1.2.3