Code

Merge branch 'cw/maint-exec-defpath' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Jun 2010 23:33:47 +0000 (16:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Jun 2010 23:33:47 +0000 (16:33 -0700)
* 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>

1  2 
Makefile
configure.ac
exec_cmd.c
git-compat-util.h

diff --cc Makefile
index ed4c733c623fc23fc324efe1fa6e58cef63961e9,98ac6e1fed6c844a67ac0bb2aa7290fff295b995..b18768e0aedfbf246173293f74049456070deec3
+++ 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
diff --cc configure.ac
Simple merge
diff --cc exec_cmd.c
Simple merge
Simple merge