From: Junio C Hamano Date: Sun, 3 Feb 2013 01:58:49 +0000 (-0800) Subject: config.mak.in: remove unused definitions X-Git-Tag: v1.8.3-rc0~145^2~2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d8cf908c?hp=7e2010537e96d0a1144520222f20ba1dc3d61441 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 --- diff --git a/Makefile b/Makefile index 26b697d175..1dae2c5bf1 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/config.mak.in b/config.mak.in index 802d34223a..947ca5776a 100644 --- a/config.mak.in +++ b/config.mak.in @@ -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@