Merge branch 'ab/push-example-in-doc'

diff --git a/config.mak.in b/config.mak.in
index e8a9bb4682a239762bc7c4946b19f58353b80baf..e6a6d0f941cb2d61586c5d5eddb2ccf27c6439db 100644 (file)
--- a/config.mak.in
+++ b/config.mak.in
@@ -8,6 +8,7 @@ LDFLAGS = @LDFLAGS@
 AR = @AR@
 TAR = @TAR@
 DIFF = @DIFF@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
 #INSTALL = @INSTALL@           # needs install-sh or install.sh in sources
 
 prefix = @prefix@
@@ -17,11 +18,7 @@ gitexecdir = @libexecdir@/git-core
 datarootdir = @datarootdir@
 template_dir = @datadir@/git-core/templates
 sysconfdir = @sysconfdir@
+docdir = @docdir@
 
 mandir = @mandir@
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-export exec_prefix mandir
-export srcdir VPATH
+htmldir = @htmldir@