summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/ncurses/buildlink.mk4
-rw-r--r--graphics/freetype2/buildlink.mk4
-rw-r--r--lang/f2c/buildlink.mk4
-rw-r--r--lang/perl5/buildlink.mk4
-rw-r--r--lang/tcl/buildlink.mk4
-rw-r--r--mk/bsd.buildlink.mk10
-rw-r--r--mk/ossaudio.buildlink.mk4
-rw-r--r--x11/tk/buildlink.mk4
8 files changed, 20 insertions, 18 deletions
diff --git a/devel/ncurses/buildlink.mk b/devel/ncurses/buildlink.mk
index b7c47a67a6d..fabd8286624 100644
--- a/devel/ncurses/buildlink.mk
+++ b/devel/ncurses/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.12 2001/10/25 19:10:18 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.13 2001/11/30 17:21:54 jlam Exp $
#
# This Makefile fragment is included by packages that use ncurses.
#
@@ -89,7 +89,7 @@ ncurses-buildlink: _BUILDLINK_USE
ncurses-extra-includes-buildlink:
${_PKG_SILENT}${_PKG_DEBUG} \
- ${ECHO_MSG} "Touching extra ncurses headers in ${BUILDLINK_DIR}."; \
+ ${ECHO_BUILDLINK_MSG} "Touching extra ncurses headers in ${BUILDLINK_DIR}."; \
extra_includes=" \
include/term.h \
"; \
diff --git a/graphics/freetype2/buildlink.mk b/graphics/freetype2/buildlink.mk
index 9fba134a929..847307dd69c 100644
--- a/graphics/freetype2/buildlink.mk
+++ b/graphics/freetype2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.12 2001/10/03 20:56:49 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.13 2001/11/30 17:21:55 jlam Exp $
#
# This Makefile fragment is included by packages that use freetype2.
#
@@ -70,7 +70,7 @@ BUILDLINK_CONFIG_WRAPPER.freetype2= ${BUILDLINK_CONFIG.freetype2}
freetype2-buildlink-config:
${_PKG_SILENT}${_PKG_DEBUG} \
if [ ! -f ${BUILDLINK_CONFIG.freetype2} ]; then \
- ${ECHO_MSG} "Creating config script ${BUILDLINK_CONFIG.freetype2}."; \
+ ${ECHO_BUILDLINK_MSG} "Creating config script ${BUILDLINK_CONFIG.freetype2}."; \
${MKDIR} ${BUILDLINK_CONFIG.freetype2:H}; \
${SED} -e "s|@AWK@|${AWK}|g" \
-e "s|@SED@|${SED}|g" \
diff --git a/lang/f2c/buildlink.mk b/lang/f2c/buildlink.mk
index 945e03d72b5..158e91ad2f5 100644
--- a/lang/f2c/buildlink.mk
+++ b/lang/f2c/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/07/27 13:33:32 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/11/30 17:21:56 jlam Exp $
#
# This Makefile fragment is included by packages that use f2c.
#
@@ -49,7 +49,7 @@ f2c-f77-buildlink:
if [ ! -f $${cookie} ]; then \
file=bin/f2c-f77; \
dest=${BUILDLINK_DIR}/$${file}; \
- ${ECHO_MSG} "Creating script $${dest}."; \
+ ${ECHO_BUILDLINK_MSG} "Creating script $${dest}."; \
dir=`${DIRNAME} $${dest}`; \
if [ ! -d $${dir} ]; then \
${MKDIR} $${dir}; \
diff --git a/lang/perl5/buildlink.mk b/lang/perl5/buildlink.mk
index b00dd335ed1..b21700b59f0 100644
--- a/lang/perl5/buildlink.mk
+++ b/lang/perl5/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/11/28 05:40:18 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/11/30 17:21:56 jlam Exp $
#
# This Makefile fragment is included by packages that use perl.
#
@@ -66,7 +66,7 @@ perl-buildlink:
${_PKG_SILENT}${_PKG_DEBUG} \
cookie=${BUILDLINK_DIR}/.perl_buildlink_done; \
if [ ! -f $${cookie} ]; then \
- ${ECHO_MSG} "Creating ${_BUILDLINK_CONFIG_PM}."; \
+ ${ECHO_BUILDLINK_MSG} "Creating ${_BUILDLINK_CONFIG_PM}."; \
${MKDIR} ${_BUILDLINK_CONFIG_PM:H}; \
${SED} ${_CONFIG_PM_SED} ${_CONFIG_PM} \
> ${_BUILDLINK_CONFIG_PM}; \
diff --git a/lang/tcl/buildlink.mk b/lang/tcl/buildlink.mk
index 7a63e006981..4c4e8bf58aa 100644
--- a/lang/tcl/buildlink.mk
+++ b/lang/tcl/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/10/23 13:02:11 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.8 2001/11/30 17:21:56 jlam Exp $
#
# This Makefile fragment is included by packages that use tcl.
#
@@ -47,7 +47,7 @@ tclConfig-buildlink:
cookie=${BUILDLINK_DIR}/.tclConfig_buildlink_done; \
if [ ! -f $${cookie} ]; then \
file=lib/tclConfig.sh; \
- ${ECHO_MSG} "Creating script ${BUILDLINK_DIR}/$${file}."; \
+ ${ECHO_BUILDLINK_MSG} "Creating script ${BUILDLINK_DIR}/$${file}."; \
${SED} ${_TCLCONFIG_SED} \
${BUILDLINK_PREFIX.tcl}/$${file} \
> ${BUILDLINK_DIR}/$${file}; \
diff --git a/mk/bsd.buildlink.mk b/mk/bsd.buildlink.mk
index ebf8ed4b6b0..cbb5e20901d 100644
--- a/mk/bsd.buildlink.mk
+++ b/mk/bsd.buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink.mk,v 1.50 2001/11/30 17:14:14 jlam Exp $
+# $NetBSD: bsd.buildlink.mk,v 1.51 2001/11/30 17:21:56 jlam Exp $
#
# This Makefile fragment is included by package buildlink.mk files. This
# file does the following things:
@@ -137,6 +137,8 @@ MAKE_ENV+= BUILDLINK_CPPFLAGS="${_BUILDLINK_CPPFLAGS}"
MAKE_ENV+= BUILDLINK_LDFLAGS="${_BUILDLINK_LDFLAGS}"
.endif
+ECHO_BUILDLINK_MSG?= ${ECHO_MSG} "=>"
+
# Filter out libtool archives from the list of file to link into
# ${BUILDLINK_DIR}. Linking against a libtool archive causes the final
# installed locations of the libraries to be used, which defeats what
@@ -150,7 +152,7 @@ _BUILDLINK_USE: .USE
${_PKG_SILENT}${_PKG_DEBUG} \
cookie=${BUILDLINK_DIR}/.${.TARGET:S/-buildlink//}_buildlink_done; \
if [ ! -f $${cookie} ]; then \
- ${ECHO_MSG} "=> Linking ${.TARGET:S/-buildlink//} files into ${BUILDLINK_DIR}."; \
+ ${ECHO_BUILDLINK_MSG} "Linking ${.TARGET:S/-buildlink//} files into ${BUILDLINK_DIR}."; \
${MKDIR} ${BUILDLINK_DIR}; \
files="${BUILDLINK_FILES.${.TARGET:S/-buildlink//}:S/^/${BUILDLINK_PREFIX.${.TARGET:S/-buildlink//}}\//g}"; \
files="`${ECHO} $${files} | ${_LIBTOOL_ARCHIVE_FILTER}`"; \
@@ -197,7 +199,7 @@ _BUILDLINK_CONFIG_WRAPPER_USE: .USE
${_PKG_SILENT}${_PKG_DEBUG} \
cookie=${BUILDLINK_DIR}/.${.TARGET:S/-buildlink-config-wrapper//}_buildlink_config_wrapper_done; \
if [ ! -f $${cookie} ]; then \
- ${ECHO_MSG} "=> Creating wrapper script ${BUILDLINK_CONFIG_WRAPPER.${.TARGET:S/-buildlink-config-wrapper//}}."; \
+ ${ECHO_BUILDLINK_MSG} "Creating wrapper script ${BUILDLINK_CONFIG_WRAPPER.${.TARGET:S/-buildlink-config-wrapper//}}."; \
${MKDIR} ${BUILDLINK_CONFIG_WRAPPER.${.TARGET:S/-buildlink-config-wrapper//}:H}; \
(${ECHO} '#!/bin/sh'; \
${ECHO} ''; \
@@ -232,7 +234,7 @@ _BUILDLINK_SUBST_USE: .USE
${MKDIR} ${BUILDLINK_DIR}; \
files="${BUILDLINK_SUBST_FILES.${.TARGET:S/-buildlink-subst//}}"; \
if [ -n "$${files}" -a -n "${BUILDLINK_SUBST_SED.${.TARGET:S/-buildlink-subst//}:Q}" ]; then \
- ${ECHO_MSG} "=> "${BUILDLINK_SUBST_MESSAGE.${.TARGET:S/-buildlink-subst//}}; \
+ ${ECHO_BUILDLINK_MSG} ${BUILDLINK_SUBST_MESSAGE.${.TARGET:S/-buildlink-subst//}}; \
cd ${WRKSRC}; \
for file in $${files}; do \
if ${_CHECK_IS_TEXT_FILE}; then \
diff --git a/mk/ossaudio.buildlink.mk b/mk/ossaudio.buildlink.mk
index a232902157b..8291b37f15a 100644
--- a/mk/ossaudio.buildlink.mk
+++ b/mk/ossaudio.buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: ossaudio.buildlink.mk,v 1.5 2001/11/21 13:57:31 agc Exp $
+# $NetBSD: ossaudio.buildlink.mk,v 1.6 2001/11/30 17:21:56 jlam Exp $
#
# This Makefile fragment is included by packages that use OSS audio.
#
@@ -39,7 +39,7 @@ ossaudio-buildlink-soundcard-h:
sys_soundcard_h=${BUILDLINK_DIR}/include/sys/soundcard.h; \
if [ ! -f $${sys_soundcard_h} -a \
-f ${BUILDLINK_PREFIX.ossaudio}/include/soundcard.h ]; then \
- ${ECHO_MSG} "Creating $${sys_soundcard_h}."; \
+ ${ECHO_BUILDLINK_MSG} "Creating $${sys_soundcard_h}."; \
${MKDIR} `${DIRNAME} $${sys_soundcard_h}`; \
( ${ECHO} "#ifndef BUILDLINK_SYS_SOUNDCARD_H"; \
${ECHO} "#define BUILDLINK_SYS_SOUNDCARD_H"; \
diff --git a/x11/tk/buildlink.mk b/x11/tk/buildlink.mk
index 49b40954a3d..cf7436bdec9 100644
--- a/x11/tk/buildlink.mk
+++ b/x11/tk/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2001/10/24 22:11:15 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.9 2001/11/30 17:21:57 jlam Exp $
#
# This Makefile fragment is included by packages that use tk.
#
@@ -50,7 +50,7 @@ tkConfig-buildlink:
cookie=${BUILDLINK_DIR}/.tkConfig_buildlink_done; \
if [ ! -f $${cookie} ]; then \
file=lib/tkConfig.sh; \
- ${ECHO_MSG} "Creating script ${BUILDLINK_DIR}/$${file}."; \
+ ${ECHO_BUILDLINK_MSG} "Creating script ${BUILDLINK_DIR}/$${file}."; \
${SED} ${_TKCONFIG_SED} \
${BUILDLINK_PREFIX.tk}/$${file} \
> ${BUILDLINK_DIR}/$${file}; \