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 <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/INSTALL b/INSTALL
index ba9778cd4de187878b6445be5fbf490d76879f30..fa9bf74a208697bd4c6cd5c91f3335b2f5475a49 100644 (file)
--- 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
 
 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
        $ ./configure --prefix=/usr ;# as yourself
        $ make all doc ;# as yourself
        # make install install-doc ;# as root

diff --git a/Makefile b/Makefile
index ae4c0f2d905c6b934459d472a17183f2740c1a2c..d8cc83507d4339181bc42a7593f516a11e53319c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -595,6 +595,13 @@ git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css
        chmod +x $@+
        mv $@+ $@
 
        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)) \
 # These can record GIT_VERSION
 git$X git.spec \
        $(patsubst %.sh,%,$(SCRIPT_SH)) \

diff --git a/configure.ac b/configure.ac
index 3c56cc51ac4bef254c5c62a0184ed6bc30f0b66d..e2da89114e31507c9784141f1ab4255cb3cb76b9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
 # 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])
 
 
 AC_CONFIG_SRCDIR([git.c])