Merge branch 'jc/remove-export-from-config-mak-in'

Stop exporting mandir that used to be exported only when
config.mak.autogen was used.  It would have broken installation of
manpages (but not other documentation formats).

* jc/remove-export-from-config-mak-in:
Fix `make install` when configured with autoconf
Makefile: do not export mandir/htmldir/infodir
config.mak.in: remove unused definitions

diff --cc config.mak.in
index fa02bdd82ada7c45b2c666438aa2df9407f5c1af,515a4aa8207091d2a5917fa7b11a30135aa263ac..e6a6d0f941cb2d61586c5d5eddb2ccf27c6439db
--- 1/config.mak.in
--- 2/config.mak.in
+++ b/config.mak.in
@@@ -18,13 -19,52 +18,7 @@@ gitexecdir = @libexecdir@/git-cor
  datarootdir = @datarootdir@
  template_dir = @datadir@/git-core/templates
  sysconfdir = @sysconfdir@
 +docdir = @docdir@
  
 -mandir=@mandir@
 -
 -NEEDS_SSL_WITH_CRYPTO=@NEEDS_SSL_WITH_CRYPTO@
 -NO_OPENSSL=@NO_OPENSSL@
 -NO_CURL=@NO_CURL@
 -NO_EXPAT=@NO_EXPAT@
 -NO_LIBGEN_H=@NO_LIBGEN_H@
 -HAVE_PATHS_H=@HAVE_PATHS_H@
 -HAVE_LIBCHARSET_H=@HAVE_LIBCHARSET_H@
 -NO_GETTEXT=@NO_GETTEXT@
 -LIBC_CONTAINS_LIBINTL=@LIBC_CONTAINS_LIBINTL@
 -NEEDS_LIBICONV=@NEEDS_LIBICONV@
 -NEEDS_SOCKET=@NEEDS_SOCKET@
 -NEEDS_RESOLV=@NEEDS_RESOLV@
 -NEEDS_LIBGEN=@NEEDS_LIBGEN@
 -NO_SYS_SELECT_H=@NO_SYS_SELECT_H@
 -NO_D_INO_IN_DIRENT=@NO_D_INO_IN_DIRENT@
 -NO_D_TYPE_IN_DIRENT=@NO_D_TYPE_IN_DIRENT@
 -NO_SOCKADDR_STORAGE=@NO_SOCKADDR_STORAGE@
 -NO_IPV6=@NO_IPV6@
 -NO_HSTRERROR=@NO_HSTRERROR@
 -NO_STRCASESTR=@NO_STRCASESTR@
 -NO_STRTOK_R=@NO_STRTOK_R@
 -NO_FNMATCH=@NO_FNMATCH@
 -NO_FNMATCH_CASEFOLD=@NO_FNMATCH_CASEFOLD@
 -NO_MEMMEM=@NO_MEMMEM@
 -NO_STRLCPY=@NO_STRLCPY@
 -NO_UINTMAX_T=@NO_UINTMAX_T@
 -NO_STRTOUMAX=@NO_STRTOUMAX@
 -NO_SETENV=@NO_SETENV@
 -NO_UNSETENV=@NO_UNSETENV@
 -NO_MKDTEMP=@NO_MKDTEMP@
 -NO_MKSTEMPS=@NO_MKSTEMPS@
 -NO_INET_NTOP=@NO_INET_NTOP@
 -NO_INET_PTON=@NO_INET_PTON@
 -NO_ICONV=@NO_ICONV@
 -OLD_ICONV=@OLD_ICONV@
 -NO_REGEX=@NO_REGEX@
 -USE_LIBPCRE=@USE_LIBPCRE@
 -NO_DEFLATE_BOUND=@NO_DEFLATE_BOUND@
 -INLINE=@INLINE@
 -SOCKLEN_T=@SOCKLEN_T@
 -FREAD_READS_DIRECTORIES=@FREAD_READS_DIRECTORIES@
 -SNPRINTF_RETURNS_BOGUS=@SNPRINTF_RETURNS_BOGUS@
 -NO_PTHREADS=@NO_PTHREADS@
 -PTHREAD_CFLAGS=@PTHREAD_CFLAGS@
 -PTHREAD_LIBS=@PTHREAD_LIBS@
 -CHARSET_LIB=@CHARSET_LIB@
 +mandir = @mandir@
 +htmldir = @htmldir@
- 
- srcdir = @srcdir@
- VPATH = @srcdir@
- 
- export exec_prefix mandir
- export srcdir VPATH