From 3900145ed72bf1dfd656af6a5b31034e818b425f Mon Sep 17 00:00:00 2001 From: Jakub Narebski Date: Tue, 8 Aug 2006 18:35:23 +0200 Subject: autoconf: Add configure target to main Makefile While at it fill git version information in configure.ac configure target needs autoconf, of course. Signed-off-by: Jakub Narebski Signed-off-by: Junio C Hamano --- INSTALL | 2 +- Makefile | 7 +++++++ configure.ac | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/INSTALL b/INSTALL index ba9778cd4d..fa9bf74a20 100644 --- a/INSTALL +++ b/INSTALL @@ -16,7 +16,7 @@ install" would not work. Alternatively you can use autoconf generated ./configure script to set up install paths (via config.mak.autogen), so you can write instead - $ autoconf ;# as yourself if ./configure doesn't exist yet + $ make configure ;# as yourself $ ./configure --prefix=/usr ;# as yourself $ make all doc ;# as yourself # make install install-doc ;# as root diff --git a/Makefile b/Makefile index ae4c0f2d90..d8cc83507d 100644 --- a/Makefile +++ b/Makefile @@ -595,6 +595,13 @@ git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css chmod +x $@+ mv $@+ $@ +configure: configure.ac + rm -f $@ $<+ + sed -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \ + $< > $<+ + autoconf -o $@ $<+ + rm -f $<+ + # These can record GIT_VERSION git$X git.spec \ $(patsubst %.sh,%,$(SCRIPT_SH)) \ diff --git a/configure.ac b/configure.ac index 3c56cc51ac..e2da89114e 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([git], [1.4.1], [git@vger.kernel.org]) +AC_INIT([git], [@@GIT_VERSION@@], [git@vger.kernel.org]) AC_CONFIG_SRCDIR([git.c]) -- cgit v1.2.3