diff -u -r1.19 -r1.20
--- common.gmk.in	5 Aug 2008 18:49:21 -0000	1.19
+++ common.gmk.in	3 Jan 2011 18:15:35 -0000	1.20
@@ -1,4 +1,4 @@

-# $Id: common.gmk.in,v 1.19 2008/08/05 18:49:21 jeremy Exp $

+# $Id: common.gmk.in,v 1.20 2011/01/03 18:15:35 jeremy Exp $

 
 #
 # Common Make variables for SimDist

@@ -17,8 +17,8 @@

 # platform
 OS_SHARED_LIBS_VAR = @OS_SHARED_LIBS_VAR@
 HOST_OS = @host_os@

-COMPILER = @compiler@
-PLATFORM = @platform@

+#COMPILER = @compiler@
+#PLATFORM = @platform@

 
 # Make vars for programs
 CVS=@CVS@

@@ -35,10 +35,11 @@

 
 # dist installation info
 dist_tarball=@dist_tarball@

-dist_tarball_current=@dist_tarball_current@

 dist_dir=@dist_dir@

-bin_tarball=@bin_tarball@
-bin_tarball_current=@bin_tarball_current@

+
+#dist_tarball_current=@dist_tarball_current@
+#bin_tarball=@bin_tarball@
+#bin_tarball_current=@bin_tarball_current@

 
 # name of slic binary
 slic_bin=@SLIC_BASEDIR@/bin/@G4SYSTEM@/@SLIC_BINNAME@

diff -u -r1.19 -r1.20
--- util.m4	20 Aug 2010 22:38:30 -0000	1.19
+++ util.m4	3 Jan 2011 18:15:35 -0000	1.20
@@ -224,35 +224,40 @@

 dnl Macro to set the name of the dist tarball.
 AC_DEFUN(AC_DIST_TGZ, [
 

-dnl Add slic version to dist name.
-dist_version=$(echo ${SLIC_VERSION} | sed -e 's/[[a-z]]/\_/g' -e 's/^_//g')

+AC_MSG_CHECKING(for dist tarball name)

-dnl Add Geant4 version to dist name.
-dist_version=${dist_version}"-geant4-"$(echo ${GEANT4_VERSION} | sed -e 's/[[a-z]]/\_/g' -e 's/^_//g')

+dnl Format slic and G4 version. (old version)
+dnl dist_slic_version="slic-"$(echo ${SLIC_VERSION} | sed -e 's/[[a-z]]/\_/g' -e 's/^_//g')
+dnl dist_g4_version="geant4-"$(echo ${GEANT4_VERSION} | sed -e 's/[[a-z]]/\_/g' -e 's/^_//g')
+dnl dist_full_version=${dist_slic_version}"_"${dist_g4_version}

-dnl versioned tarball name
-dist_tarball="slic-"${dist_version}"-"${host_os}"-dist".tar.gz

+dnl Create tag with slic and Geant4 versions.
+dist_full_version="slic-"${SLIC_VERSION}"_geant4-"${GEANT4_VERSION}
+
+dnl Create host info tag.
+dist_host=${host_cpu}"-"${host_vendor}"-"${host_os}
+
+dnl Name of the dist tarball with version tags.
+dist_tarball=${dist_full_version}"_"${dist_host}.tar.gz

 
 dnl non-versioned tarball name

-dist_tarball_current="slic-current-"${host_os}"-dist".tar.gz

+dnl dist_tarball_current="slic-current_"${dist_host}.tar.gz

 
 dnl versioned tarball containing binary, xerces, and runscript

-bin_tarball="slic-"${dist_version}"-"${host_os}"-bin".tar.gz

+dnl #bin_tarball="slic-"${dist_version}"_"${dist_host}"-bin".tar.gz

 
 dnl non-versioned bindist tarball name

-bin_tarball_current="slic-current-"${host_os}"-bin".tar.gz
-
-#echo "bin_tarball_current=$bin_tarball_current"
-
-#echo "bin_tarball=$bin_tarball"

+dnl bin_tarball_current="slic-current_"${dist_host}"-bin".tar.gz

 
 dnl substitute to common.gmk
 AC_SUBST(dist_tarball)

-AC_SUBST(dist_tarball_current)
-AC_SUBST(dist_version)

+dnl AC_SUBST(dist_tarball_current)
+dnl AC_SUBST(dist_version)
+dnl AC_SUBST(bin_tarball_current)
+dnl AC_SUBST(bin_tarball)

-AC_SUBST(bin_tarball_current)
-AC_SUBST(bin_tarball)

+dnl Print tarball name.
+AC_MSG_RESULT($dist_tarball)

 
 ])