From d3dd72ada606c080e19336489ab1f7f4d9eee27c Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Wed, 27 Feb 2008 21:32:45 +0000
Subject: If FOO is empty, then ${FOO:S/^/-l/} has a value of "-l".  This is
 not what we want.  Instead, use another pattern to strip away lone "-l" in
 BUILDLINK_LDADD.*.

---
 mk/curses.buildlink3.mk  | 4 ++--
 mk/termlib.buildlink3.mk | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'mk')

diff --git a/mk/curses.buildlink3.mk b/mk/curses.buildlink3.mk
index 179262fc1d6..8db09bdb590 100644
--- a/mk/curses.buildlink3.mk
+++ b/mk/curses.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: curses.buildlink3.mk,v 1.10 2008/02/27 15:26:34 jlam Exp $
+# $NetBSD: curses.buildlink3.mk,v 1.11 2008/02/27 21:32:45 jlam Exp $
 #
 # This Makefile fragment is meant to be included by packages that require
 # any curses implementation instead of one particular one.  The available
@@ -87,7 +87,7 @@ PKG_FAIL_REASON=	\
 BUILDLINK_PACKAGES:=		${BUILDLINK_PACKAGES:Ncurses}
 BUILDLINK_PACKAGES+=		curses
 BUILDLINK_ORDER:=		${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}curses
-BUILDLINK_LDADD.curses?=	${BUILDLINK_LIBNAME.curses:S/^/-l/}
+BUILDLINK_LDADD.curses?=	${BUILDLINK_LIBNAME.curses:S/^/-l/:S/^-l$//}
 BUILDLINK_BUILTIN_MK.curses=	../../mk/curses.builtin.mk
 .elif ${CURSES_TYPE} == "ncurses"
 USE_NCURSES=			yes
diff --git a/mk/termlib.buildlink3.mk b/mk/termlib.buildlink3.mk
index 0c97ead5bbc..98dc7549652 100644
--- a/mk/termlib.buildlink3.mk
+++ b/mk/termlib.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: termlib.buildlink3.mk,v 1.3 2008/02/27 17:36:34 jlam Exp $
+# $NetBSD: termlib.buildlink3.mk,v 1.4 2008/02/27 21:32:45 jlam Exp $
 #
 # This Makefile fragment is meant to be included by packages that require
 # a basic termlib implementation.
@@ -40,7 +40,7 @@ BUILDLINK_PACKAGES:=		${BUILDLINK_PACKAGES:Ntermlib}
 BUILDLINK_PACKAGES+=		termlib
 BUILDLINK_ORDER:=		${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}termlib
 BUILDLINK_LIBNAME.termlib?=	${BUILTIN_LIBNAME.termlib}
-BUILDLINK_LDADD.termlib?=	${BUILDLINK_LIBNAME.termlib:S/^/-l/}
+BUILDLINK_LDADD.termlib?=	${BUILDLINK_LIBNAME.termlib:S/^/-l/:S/^-l$//}
 BUILDLINK_BUILTIN_MK.termlib=	../../mk/termlib.builtin.mk
 .elif ${TERMLIB_TYPE} == "curses"
 .  include "../../mk/curses.buildlink3.mk"
-- 
cgit v1.2.3