Merge branch 'jc/remove-export-from-config-mak-in'
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Apr 2013 16:00:01 +0000 (09:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Apr 2013 16:00:02 +0000 (09:00 -0700)
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

config.mak.in
index fa02bdd82ada7c45b2c666438aa2df9407f5c1af..e6a6d0f941cb2d61586c5d5eddb2ccf27c6439db 100644 (file)
@@ -22,9 +22,3 @@ docdir = @docdir@
 
 mandir = @mandir@
 htmldir = @htmldir@
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-export exec_prefix mandir
-export srcdir VPATH