diff options
| author | jlam <jlam@pkgsrc.org> | 2008-02-27 21:32:45 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2008-02-27 21:32:45 +0000 |
| commit | d3dd72ada606c080e19336489ab1f7f4d9eee27c (patch) | |
| tree | 4df64a26e77e3cfa706e239c1981ac8787dad444 /mk | |
| parent | d2c2c0645610511983c60396a511beb49a739813 (diff) | |
| download | pkgsrc-d3dd72ada606c080e19336489ab1f7f4d9eee27c.tar.gz | |
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.*.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/curses.buildlink3.mk | 4 | ||||
| -rw-r--r-- | mk/termlib.buildlink3.mk | 4 |
2 files changed, 4 insertions, 4 deletions
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" |