Re: [PATCH 0/2] Set Makefile variables from configure

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Ben Walton wrote:
> These patches add support for setting the newly created DEFAULT_EDITOR
> and DEFAULT_PAGER from the configure script.  I also tacked in
> ETC_GITCONFIG, since I can't currently toggle this without setting a
> command line value when building, but have need to alter it.

Would the --sysconfdir option work for you here?  Setting --sysconfdir
currently does nothing, so the question is kind of moot without some
change like this (untested):

Hook up more of ./configure’s installation directory options to
actually do something.  Unfortunately, this defeats the RUNTIME_PREFIX
facility unless all the relevant paths are explicitly set.  Probably
the defaults set in Makefile should not be overridden unless
explicitly requested.

This patch also changes the default location for HTML documentation
after running ./configure from /usr/local/share/git-doc to
/usr/local/share/git.  In my opinion, the fix to this would also be to
make the configure script not override defaults from Makefile.

 config.mak.in |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/config.mak.in b/config.mak.in
index 67b12f7..430134a 100644
--- a/config.mak.in
+++ b/config.mak.in
@@ -11,17 +11,21 @@ TAR = @TAR@
 TCLTK_PATH = @TCLTK_PATH@
 
 prefix = @prefix@
-exec_prefix = @exec_prefix@
 bindir = @bindir@
+mandir = @mandir@
+infodir = @infodir@
 gitexecdir = @libexecdir@/git-core
-datarootdir = @datarootdir@
+sharedir = @datadir@
 template_dir = @datadir@/git-core/templates
+htmldir = @htmldir@
+sysconfdir = @sysconfdir@
 
-mandir=@mandir@
-
+exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+docdir = @docdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-
 export exec_prefix mandir
 export srcdir VPATH
 
-- 
1.6.5.2

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]