mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-14 13:13:01 +01:00
Code Activity
git/config.mak.in

25 lines
540 B
Makefile
Raw Normal View History

autoconf: Use autoconf to write installation directories to config.mak.autogen This is beginning of patch series introducing installation configuration using autoconf (and no other autotools) to git. The idea is to generate config.mak.autogen using ./configure (generated from configure.ac by running autoconf) from config.mak.in, so one can use autoconf as an _alternative_ to ordinary Makefile, and creating one's own config.mak. Local settings in config.mak override generated settings in config.mak.autogen This patch includes minimal configure.ac and config.mak.in, so one can set installation directories using autoconf generated ./configure script e.g. ./configure --prefix=/usr Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-07-03 01:56:48 +02:00
# git Makefile configuration, included in main Makefile
# @configure_input@
autoconf: Checks for some programs ./configure script checks now for the following programs: * CC - using AC_PROG_CC * AR - using AC_CHECK_TOOL among ar * TAR - among gtar, tar Checks not implemented: * INSTALL - needs install-sh or install.sh in sources * RPMBUILD - not known alternatives for rpmbuild * PYTHON - no PYTHON variable in Makefile, has to set NO_PYTHON if not present Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-07-08 23:07:13 +02:00
CC = @CC@
Fix compilation with Sun CC - Add the CFLAGS variable to config.mak.in to override the Makefile's default, which is gcc-specific and won't work with Sun CC. - Prefer "cc" over "gcc", because Pasky's Git.pm will not compile with gcc on Solaris at all. On Linux and the free BSDs "cc" is linked to "gcc" anyway. - Set correct flag to generate position-independent code. - Add "-xO3" (= use default optimization level) to CFLAGS. Signed-off-by: Dennis Stosberg <dennis@stosberg.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-15 11:01:31 +02:00
CFLAGS = @CFLAGS@
Makefile: pass CPPFLAGS through to fllow customization Without this patch there is no straight forward way to pass additional CPPFLAGS at configure-time. At TWW, everything non-vendor package is installed to its own subdirectory, so we need the following to show the preprocessor where the headers for the libraries we will link later can be found: $SHELL ./configure \ CPPFLAGS="-I${SB_VAR_CURL_INC}\ -I${SB_VAR_LIBEXPAT_INC}\ -I${SB_VAR_LIBZ_INC}\ ${CPPFLAGS+ $CPPFLAGS}" <<...>> Signed-off-by: Gary V. Vaughan <gary@thewrittenword.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-05-14 11:31:32 +02:00
CPPFLAGS = @CPPFLAGS@
config.mak.in: Pass on LDFLAGS from configure The configure script allows you to specify flags to pass to the linker step in the LDFLAGS environment variable but this was being ignored in the Makefile. Now a make variable gets set to the value passed down from the configure script. Signed-off-by: Neil Roberts <bpeeluk@yahoo.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-08-21 21:38:23 +02:00
LDFLAGS = @LDFLAGS@
autoconf: Checks for some programs ./configure script checks now for the following programs: * CC - using AC_PROG_CC * AR - using AC_CHECK_TOOL among ar * TAR - among gtar, tar Checks not implemented: * INSTALL - needs install-sh or install.sh in sources * RPMBUILD - not known alternatives for rpmbuild * PYTHON - no PYTHON variable in Makefile, has to set NO_PYTHON if not present Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-07-08 23:07:13 +02:00
AR = @AR@
TAR = @TAR@
Do not use "diff" found on PATH while building and installing Some of the flags used with the first diff found in PATH cause the vendor diff to choke. Signed-off-by: Gary V. Vaughan <gary@thewrittenword.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-05-14 11:31:36 +02:00
DIFF = @DIFF@
Bugfix: undefined htmldir in config.mak.autogen Html documents will be installed to root dir (/) no matter what prefix is set, if run these commands before `make` and `make install-html`: $ make configure $ ./configure --prefix=<PREFIX> After the installation, all the html documents will copy to rootdir (/), and: $ git --html-path <PREFIX> $ git help -w something fatal: '<PREFIX>': not a documentation directory. This is because the variable "htmldir" points to a undefined variable "$(docdir)" in file "config.mak.autogen", which is generated by running `./configure`. By default $(docdir) generated by configure is supposed be set this way: datarootdir='${prefix}/share' htmldir='${docdir}' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' but since fc1c5415d69d (Honor configure's htmldir switch, 2013-02-02), we only set and export htmldir without doing so for PACKAGE_TARNAME (which is set to 'git' by the configure script). Add the required two variables "PACKAGE_TARNAME" and "docdir" to file "config.mak.in" will work this issue around. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-02-19 12:23:29 +01:00
PACKAGE_TARNAME = @PACKAGE_TARNAME@
autoconf: Checks for some programs ./configure script checks now for the following programs: * CC - using AC_PROG_CC * AR - using AC_CHECK_TOOL among ar * TAR - among gtar, tar Checks not implemented: * INSTALL - needs install-sh or install.sh in sources * RPMBUILD - not known alternatives for rpmbuild * PYTHON - no PYTHON variable in Makefile, has to set NO_PYTHON if not present Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-07-08 23:07:13 +02:00
#INSTALL = @INSTALL@ # needs install-sh or install.sh in sources
autoconf: Use autoconf to write installation directories to config.mak.autogen This is beginning of patch series introducing installation configuration using autoconf (and no other autotools) to git. The idea is to generate config.mak.autogen using ./configure (generated from configure.ac by running autoconf) from config.mak.in, so one can use autoconf as an _alternative_ to ordinary Makefile, and creating one's own config.mak. Local settings in config.mak override generated settings in config.mak.autogen This patch includes minimal configure.ac and config.mak.in, so one can set installation directories using autoconf generated ./configure script e.g. ./configure --prefix=/usr Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-07-03 01:56:48 +02:00
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
config.mak.in: define paths without trailing slash The main Makefile defines gitexecdir and template_dir without trailing slash. config.mak.in should do the same to be consistent. Signed-off-by: Pascal Obry <pascal@obry.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-02-05 08:37:24 +01:00
gitexecdir = @libexecdir@/git-core
Set datarootdir in config.mak.in Autoconf 2.60 expresses datadir in terms of datarootdir. If datarootdir is not substituted, configure issues a warning and uses a compatibility substitution for datadir. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-07-15 07:29:21 +02:00
datarootdir = @datarootdir@
config.mak.in: define paths without trailing slash The main Makefile defines gitexecdir and template_dir without trailing slash. config.mak.in should do the same to be consistent. Signed-off-by: Pascal Obry <pascal@obry.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-02-05 08:37:24 +01:00
template_dir = @datadir@/git-core/templates
config.mak.in: allow "configure --sysconfdir=/else/where" We do allow vanilla Makefile users to say make sysconfdir=/else/where and config.mak can also be tweaked manually for the same effect. Give the same configurablity to ./configure users as well. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-05-05 03:50:45 +02:00
sysconfdir = @sysconfdir@
Bugfix: undefined htmldir in config.mak.autogen Html documents will be installed to root dir (/) no matter what prefix is set, if run these commands before `make` and `make install-html`: $ make configure $ ./configure --prefix=<PREFIX> After the installation, all the html documents will copy to rootdir (/), and: $ git --html-path <PREFIX> $ git help -w something fatal: '<PREFIX>': not a documentation directory. This is because the variable "htmldir" points to a undefined variable "$(docdir)" in file "config.mak.autogen", which is generated by running `./configure`. By default $(docdir) generated by configure is supposed be set this way: datarootdir='${prefix}/share' htmldir='${docdir}' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' but since fc1c5415d69d (Honor configure's htmldir switch, 2013-02-02), we only set and export htmldir without doing so for PACKAGE_TARNAME (which is set to 'git' by the configure script). Add the required two variables "PACKAGE_TARNAME" and "docdir" to file "config.mak.in" will work this issue around. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-02-19 12:23:29 +01:00
docdir = @docdir@
autoconf: Use autoconf to write installation directories to config.mak.autogen This is beginning of patch series introducing installation configuration using autoconf (and no other autotools) to git. The idea is to generate config.mak.autogen using ./configure (generated from configure.ac by running autoconf) from config.mak.in, so one can use autoconf as an _alternative_ to ordinary Makefile, and creating one's own config.mak. Local settings in config.mak override generated settings in config.mak.autogen This patch includes minimal configure.ac and config.mak.in, so one can set installation directories using autoconf generated ./configure script e.g. ./configure --prefix=/usr Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-07-03 01:56:48 +02:00
Makefile: whitespace style fixes in macro definitions Consistently use a single space before and after the "=" (or ":=", "+=", etc.) in assignments to make macros. Granted, this was not a big deal, but I did find the needless inconsistency quite distracting. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-12-09 11:36:17 +01:00
mandir = @mandir@
Honor configure's htmldir switch Honor autoconf's --htmldir switch. This allows relocating HTML docs straight from the configure script. Signed-off-by: Christoph J. Thompson <cjsthompson@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-02-02 22:25:11 +01:00
htmldir = @htmldir@
Copy permalink