From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 16 Jun 2010 23:33:47 +0000 (-0700)
Subject: Merge branch 'cw/maint-exec-defpath' into maint
X-Git-Tag: v1.7.2-rc0~7^2~33
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7e74a73e6b57652c2710a9814a5449afeec5bd44;p=git.git

Merge branch 'cw/maint-exec-defpath' into maint

* cw/maint-exec-defpath:
  autoconf: Check if <paths.h> exists and set HAVE_PATHS_H
  exec_cmd.c: replace hard-coded path list with one from <paths.h>
---

7e74a73e6b57652c2710a9814a5449afeec5bd44
diff --cc Makefile
index ed4c733c6,98ac6e1fe..b18768e0a
--- a/Makefile
+++ b/Makefile
@@@ -884,9 -856,9 +891,10 @@@ ifeq ($(uname_S),NetBSD
  	BASIC_LDFLAGS += -L/usr/pkg/lib $(CC_LD_DYNPATH)/usr/pkg/lib
  	USE_ST_TIMESPEC = YesPlease
  	NO_MKSTEMPS = YesPlease
+ 	HAVE_PATHS_H = YesPlease
  endif
  ifeq ($(uname_S),AIX)
 +	DEFAULT_PAGER = more
  	NO_STRCASESTR=YesPlease
  	NO_MEMMEM = YesPlease
  	NO_MKDTEMP = YesPlease