Subject: rev 32 - trunk trunk/www

From: [email-masked]
Date: Tue, 8 Oct 2002 00:23:18 -0500

Author: loredana
Date: 2002-10-08 00:23:13 -0500 (Tue, 08 Oct 2002)
New Revision: 32

Modified:
   trunk/Makefile.in
   trunk/configure.in
   trunk/dist.sh
   trunk/www/index.html.in
Log:

   * configure.in: better name for svn revision. Use '?' if svn is not available.  

   * Makefile.in,www/index.html.in: modified to reflect changes

   * dist.sh: rm config.cache before configure

Modified: trunk/Makefile.in
==============================================================================
--- trunk/Makefile.in	(original)
+++ trunk/Makefile.in	Tue Oct  8 00:23:17 2002
@@ -9,7 +9,7 @@
 CFLAGS = @CFLAGS@
 
 VERSION=@VERSION@
-SVN_REPOSITORY_VERSION=@SVN_REPOSITORY_VERSION@
+SVN_REVISION=@SVN_REVISION@
 ARCHITECTURE=@ARCHITECTURE@
 
 # PREFIXDIR is the "top level" directory in which to place the
@@ -47,7 +47,7 @@
 
 ### You should not need to modify anything below this line.
 SOURCE_DIRS=phylo readers analyses lisp docs
-DISTDIR=ale-${VERSION}-${SVN_REPOSITORY_VERSION}
+DISTDIR=ale-${VERSION}-${SVN_REVISION}
 VC_SUBDIR=.svn
 
 all: ale lisp/gene-version.el

Modified: trunk/www/index.html.in
==============================================================================
--- trunk/www/index.html.in	(original)
+++ trunk/www/index.html.in	Tue Oct  8 00:23:17 2002
@@ -61,8 +61,9 @@
 Also, you can:
 
 <ul>
-  <li><a href="ale-@VERSION@-@SVN_REPOSITORY_VERSION@.tar.gz"
-      >Download prepackaged source code to Ale @VERSION@ svn @SVN_REPOSITORY_VERSION@.</a>
+  <li><a href="ale-@VERSION@-@SVN_REVISION@.tar.gz"
+      >Download prepackaged source code to Ale @VERSION@ (built using svn 
+revision @SVN_REVISION@).</a>
   </li>
 <br>
   <li><a href="http://svn.red-bean.com:8080/ale/trunk/"

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Oct  8 00:23:17 2002
@@ -9,8 +9,9 @@
 AC_SUBST(VERSION)
 VERSION=0.1.188
 
-AC_SUBST(SVN_REPOSITORY_VERSION)
-SVN_REPOSITORY_VERSION=`svn st -vN . | head -1 | awk '{print $2}`
+dnl Set the repository revision here ('?' if svn is not available).
+AC_SUBST(SVN_REVISION)
+AC_CHECK_PROG(SVN_REVISION,svn,`svn st -vN .|head -1|awk '{print $2}'`,?)
 
 dnl Find Emacs, and 
 AC_PATH_PROG(EMACS,emacs)
@@ -54,4 +55,5 @@
            readers/Makefile
                www/index.html)
 
-AC_MSG_WARN(Using Ale version $VERSION and local svn copy n. $SVN_REPOSITORY_VERSION)
+dnl Beware:
+AC_MSG_WARN(Using Ale version $VERSION and local svn revision $SVN_REVISION)

Modified: trunk/dist.sh
==============================================================================
--- trunk/dist.sh	(original)
+++ trunk/dist.sh	Tue Oct  8 00:23:17 2002
@@ -4,6 +4,9 @@
 # to publish the latest version of Ale.
 
 ./autogen.sh
+# svn revision is cached. We want to use the most up-to-date one.
+# Therefore:
+rm config.cache		
 ./configure
 make dist
 mv ale-*.tar.gz www/