aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-15 13:48:22 -0700
committerJunio C Hamano <junkio@cox.net>2006-05-15 13:48:22 -0700
commitd55aaefa3e3920bdf9a52d80da2a244f72742228 (patch)
treec265d4d469c854e633886dad092ede685e248a93 /Makefile
parentde1d4fa2a1273e09c32653c7a21602e36223348c (diff)
parent1b9bc5a7b7434d771726011613a00cb202bd9f44 (diff)
downloadgit-d55aaefa3e3920bdf9a52d80da2a244f72742228.tar.gz
git-d55aaefa3e3920bdf9a52d80da2a244f72742228.tar.xz
Merge branch 'fix'
* fix: Fix pack-index issue on 64-bit platforms a bit more portably. Install git-send-email by default Fix compilation on newer NetBSD systems git config syntax updates Another config file parsing fix. checkout: use --aggressive when running a 3-way merge (-m).
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 93918a037..f4b6ef875 100644
--- a/Makefile
+++ b/Makefile
@@ -286,7 +286,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