[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.8.8-976-g782dd4c

[Jesse Vincent]

The branch, 3.9-trunk has been updated
       via  782dd4cd4fcbfb5735626585dccd15bfaa643a2d (commit)
       via  bb71c20623e4795930f50647a7c310bafe8dda24 (commit)
      from  e3e391e60c6778d28dc5cf8d4a1b8b47a3acbfc2 (commit)

Summary of changes:
 Makefile.in  |    4 ++--
 configure.ac |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit bb71c20623e4795930f50647a7c310bafe8dda24
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Tue Sep 28 13:17:23 2010 -0400

    Add support for a .tag directory in the root of the distribution
    which can reseed autoconf when the RT distribution is being
    autoconfed from outside of a git checkout

diff --git a/Makefile.in b/Makefile.in
index adf6fe2..04a8f93 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -515,7 +515,7 @@ apachectl:
 SNAPSHOT=$(shell git describe --tags)
 snapshot:
 	git archive --prefix "$(SNAPSHOT)/"  HEAD | tar -xf -
-	( cd $(SNAPSHOT) && autoconf && ./configure )
+	( cd $(SNAPSHOT) && echo "$(SNAPSHOT)" > .tag && autoconf && ./configure )
 	tar -czf "$(SNAPSHOT).tar.gz" "$(SNAPSHOT)/"
 	gpg --clearsign "$(SNAPSHOT).tar.gz"
 	sha1sum "$(SNAPSHOT).tar.gz*"
diff --git a/configure.ac b/configure.ac
index 3b0046b..9d4cad4 100755
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_REVISION($Revision$)dnl
 
 dnl Setup autoconf
 AC_PREREQ([2.53])
-AC_INIT(RT, m4_esyscmd([(git describe --tags || echo "rt-3.9.EXPORTED" )| tr -d "\n"]), [rt-bugs at bestpractical.com])
+AC_INIT(RT, m4_esyscmd([( git describe --tags || cat ./.tag 2> /dev/null || echo "rt-3.9.EXPORTED" )| tr -d "\n"]), [rt-bugs at bestpractical.com])
 AC_CONFIG_SRCDIR([lib/RT.pm.in])
 
 dnl Extract RT version number components

commit 782dd4cd4fcbfb5735626585dccd15bfaa643a2d
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Tue Sep 28 13:18:06 2010 -0400

    fix our sha1 code in make snapshot

diff --git a/Makefile.in b/Makefile.in
index 04a8f93..66aa4f0 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -518,5 +518,5 @@ snapshot:
 	( cd $(SNAPSHOT) && echo "$(SNAPSHOT)" > .tag && autoconf && ./configure )
 	tar -czf "$(SNAPSHOT).tar.gz" "$(SNAPSHOT)/"
 	gpg --clearsign "$(SNAPSHOT).tar.gz"
-	sha1sum "$(SNAPSHOT).tar.gz*"
+	sha1sum $(SNAPSHOT).tar.gz*
 	rm -fr "$(SNAPSHOT)/"

-----------------------------------------------------------------------