diff options
| author |  Dennis Stosberg <dennis@stosberg.net> | 2006-05-11 19:35:31 +0200 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-05-15 13:00:01 -0700 |
| commit | e88856b485cd73dfc1f3ef8d4c5b52a2f557e8c8 (patch) | |
| tree | 616f748b9c815776c7cb9273e774083a7a43b7d5 | |
| parent | Merge branch 'fix' into maint (diff) | |
| download | tgif-e88856b485cd73dfc1f3ef8d4c5b52a2f557e8c8.tar.xz | |
Fix compilation on newer NetBSD systems
NetBSD >=2.0 has iconv() in libc. A libiconv is not required and
does not exist.
See: http://netbsd.gw.com/cgi-bin/man-cgi?iconv+3+NetBSD-2.0
[jc: with a bit of simplification later discussed on the list.]
Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -281,7 +281,9 @@ ifeq ($(uname_S),OpenBSD) ALL_LDFLAGS += -L/usr/local/lib endif ifeq ($(uname_S),NetBSD) - NEEDS_LIBICONV = YesPlease + ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2) + NEEDS_LIBICONV = YesPlease + endif ALL_CFLAGS += -I/usr/pkg/include ALL_LDFLAGS += -L/usr/pkg/lib -Wl,-rpath,/usr/pkg/lib endif |