pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/audio/festival Avoid using != to set PKG_COMPILER -- d...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6ae6f16a9184
branches:  trunk
changeset: 493170:6ae6f16a9184
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Apr 28 22:21:52 2005 +0000

description:
Avoid using != to set PKG_COMPILER -- defer using :sh.  This removes the
need for ECHO to be defined for the top-level make.

diffstat:

 audio/festival/Makefile |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r 30d9f1ec0eeb -r 6ae6f16a9184 audio/festival/Makefile
--- a/audio/festival/Makefile   Thu Apr 28 22:16:31 2005 +0000
+++ b/audio/festival/Makefile   Thu Apr 28 22:21:52 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/04/11 21:44:52 tv Exp $
+# $NetBSD: Makefile,v 1.38 2005/04/28 22:21:52 jlam Exp $
 
 DISTNAME=      festival-1.95-beta
 PKGNAME=       festival-1.95beta
@@ -27,9 +27,9 @@
 .include "../../mk/compiler.mk"
 
 .if !empty(PKGSRC_COMPILER:Msunpro)
-PKG_COMPILER?= suncc
+PKG_COMPILER?=         suncc
 .else
-PKG_COMPILER!= case "${CC_VERSION}" in                                 \
+PKG_COMPILER_cmd=      case "${CC_VERSION}" in                         \
                        gcc-2.6.*)      ${ECHO} gcc26;;                 \
                        gcc-2.7.*)      ${ECHO} gcc27;;                 \
                        gcc-2.8.*)      ${ECHO} gcc28;;                 \
@@ -37,7 +37,8 @@
                        gcc-3.3.*)      ${ECHO} gcc32;;                 \
                        egcs*)          ${ECHO} egcs;;                  \
                        *)              ${ECHO} ;;                      \
-               esac
+                       esac
+PKG_COMPILER=          ${PKG_COMPILER_cmd:sh}
 .endif
 
 .if empty(PKG_COMPILER)



Home | Main Index | Thread Index | Old Index