config.mak.inon commit mergetool: Add prompt to continue after failing to merge a file (b0169d8)
   1# git Makefile configuration, included in main Makefile
   2# @configure_input@
   3
   4CC = @CC@
   5CFLAGS = @CFLAGS@
   6LDFLAGS = @LDFLAGS@
   7CC_LD_DYNPATH = @CC_LD_DYNPATH@
   8AR = @AR@
   9TAR = @TAR@
  10#INSTALL = @INSTALL@            # needs install-sh or install.sh in sources
  11TCLTK_PATH = @TCLTK_PATH@
  12
  13prefix = @prefix@
  14exec_prefix = @exec_prefix@
  15bindir = @bindir@
  16gitexecdir = @libexecdir@/git-core/
  17datarootdir = @datarootdir@
  18template_dir = @datadir@/git-core/templates/
  19
  20mandir=@mandir@
  21
  22srcdir = @srcdir@
  23VPATH = @srcdir@
  24
  25export exec_prefix mandir
  26export srcdir VPATH
  27
  28ASCIIDOC8=@ASCIIDOC8@
  29NEEDS_SSL_WITH_CRYPTO=@NEEDS_SSL_WITH_CRYPTO@
  30NO_OPENSSL=@NO_OPENSSL@
  31NO_CURL=@NO_CURL@
  32NO_EXPAT=@NO_EXPAT@
  33NEEDS_LIBICONV=@NEEDS_LIBICONV@
  34NEEDS_SOCKET=@NEEDS_SOCKET@
  35NO_SYS_SELECT_H=@NO_SYS_SELECT_H@
  36NO_D_INO_IN_DIRENT=@NO_D_INO_IN_DIRENT@
  37NO_D_TYPE_IN_DIRENT=@NO_D_TYPE_IN_DIRENT@
  38NO_SOCKADDR_STORAGE=@NO_SOCKADDR_STORAGE@
  39NO_IPV6=@NO_IPV6@
  40NO_C99_FORMAT=@NO_C99_FORMAT@
  41NO_STRCASESTR=@NO_STRCASESTR@
  42NO_MEMMEM=@NO_MEMMEM@
  43NO_STRLCPY=@NO_STRLCPY@
  44NO_UINTMAX_T=@NO_UINTMAX_T@
  45NO_STRTOUMAX=@NO_STRTOUMAX@
  46NO_SETENV=@NO_SETENV@
  47NO_UNSETENV=@NO_UNSETENV@
  48NO_MKDTEMP=@NO_MKDTEMP@
  49NO_ICONV=@NO_ICONV@
  50OLD_ICONV=@OLD_ICONV@
  51NO_DEFLATE_BOUND=@NO_DEFLATE_BOUND@
  52FREAD_READS_DIRECTORIES=@FREAD_READS_DIRECTORIES@
  53SNPRINTF_RETURNS_BOGUS=@SNPRINTF_RETURNS_BOGUS@
  54PTHREAD_LIBS=@PTHREAD_LIBS@