config.mak.in: remove unused definitions

When 5566771 (autoconf: Use autoconf to write installation
directories to config.mak.autogen, 2006-07-03) introduced support
for autoconf generated config.mak file, it added an "export" for a
few common makefile variables, in addition to definitions of srcdir
and VPATH.

The "export" logically does not belong there.  The make variables
like mandir, prefix, etc, should be exported to submakes for people
who use config.mak and people who use config.mak.autogen the same
way; if we want to get these exported, that should be in the main
Makefile.

We do use mandir and htmldir in Documentation/Makefile, so let's
add export for them in the main Makefile instead.

We may eventually want to support VPATH, and srcdir may turn out to
be useful for that purpose, but right now nobody uses it, so it is
useless to define them in this file.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
pull/37/merge
Junio C Hamano 10 years ago
parent 7e2010537e
commit d8cf908cb6
  1. 2
      Makefile
  2. 7
      config.mak.in

@ -359,7 +359,7 @@ lib = lib
# DESTDIR=
pathsep = :
export prefix bindir sharedir sysconfdir gitwebdir localedir
export prefix bindir sharedir mandir htmldir sysconfdir gitwebdir localedir
CC = cc
AR = ar

@ -13,7 +13,6 @@ DIFF = @DIFF@
TCLTK_PATH = @TCLTK_PATH@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
gitexecdir = @libexecdir@/git-core
datarootdir = @datarootdir@
@ -22,12 +21,6 @@ sysconfdir = @sysconfdir@
mandir=@mandir@
srcdir = @srcdir@
VPATH = @srcdir@
export exec_prefix mandir
export srcdir VPATH
NEEDS_SSL_WITH_CRYPTO=@NEEDS_SSL_WITH_CRYPTO@
NO_OPENSSL=@NO_OPENSSL@
NO_CURL=@NO_CURL@

Loading…
Cancel
Save