diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-05-21 13:02:17 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-05-21 13:02:17 +0200 |
commit | 455bda993cceb42921c9ff173da26651f1d66602 (patch) | |
tree | 4e3fd6c8f85e1dbb70d8ea6356b569b0bb9c7e80 /git-compat-util.h | |
parent | Merge branch 'tr/word-diff' (diff) | |
parent | autoconf: Check if <paths.h> exists and set HAVE_PATHS_H (diff) | |
download | git-455bda993cceb42921c9ff173da26651f1d66602.tar.xz git-455bda993cceb42921c9ff173da26651f1d66602.zip |
Merge branch 'cw/maint-exec-defpath'
* 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>
Diffstat (limited to 'git-compat-util.h')
-rw-r--r-- | git-compat-util.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index 001e5db4bb..edf352dee2 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -164,6 +164,13 @@ extern char *gitbasename(char *); #define PATH_SEP ':' #endif +#ifdef HAVE_PATHS_H +#include <paths.h> +#endif +#ifndef _PATH_DEFPATH +#define _PATH_DEFPATH "/usr/local/bin:/usr/bin:/bin" +#endif + #ifndef STRIP_EXTENSION #define STRIP_EXTENSION "" #endif |