diff -u -r1.15 -r1.16
--- configure	30 Jan 2006 20:48:11 -0000	1.15
+++ configure	30 Jan 2006 21:29:07 -0000	1.16
@@ -272,7 +272,7 @@

 PACKAGE_STRING='SimDist v1r0p0'
 [log in to unmask]
 

-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT have_cvs CVS have_java JAVA have_ant ANT have_wget WGET have_scp SCP host_os platform compiler os_shared_libs_var packages_dep_order packages_reverse_dep_order download_script cvs_script patch_script gen_files sim_dist_dir sim_packages_dir sim_build_dir sim_scripts_dir USE_OGL OGLHOME clhep_version_dot clhep clhep_version clhep_package_dir clhep_base_dir clep_build_dir clhep_tgz_local clhep_dir_orig clhep_download clhep_config_opts gdml gdml_version gdml_package_dir gdml_base_dir gdml_build_dir gdml_tgz_local gdml_dir_orig gdml_download g!
 dml_config_opts g4system geant4_version_download geant4 geant4_version geant4_package_dir geant4_base_dir geant4_build_dir geant4_tgz_local geant4_dir_orig geant4_download lcdd lcdd_version lcdd_package_dir lcdd_base_dir lcdd_build_dir lcdd_cvsroot lcio lcio_version lcio_package_dir lcio_base_dir lcio_build_dir lcio_cvsroot lcphys lcphys_version lcphys_package_dir lcphys_base_dir lcphys_cvsmodule lcphys_cvsroot slic slic_version slic_package_dir slic_base_dir slic_cvsroot xerces_configure_args xerces_version_underscore xerces xerces_version xerces_package_dir xerces_base_dir xerces_build_dir xerces_config xerces_tgz_local xerces_config_opts xerces_download xerces_dir_orig dist_tarball dist_tarball_current dist_version dist_dir LIBOBJS LTLIBOBJS'

+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT have_cvs CVS have_java JAVA have_ant ANT have_wget WGET have_scp SCP host_os platform compiler os_shared_libs_var sim_dist_dir_basename packages_dep_order packages_reverse_dep_order download_script cvs_script patch_script gen_files sim_dist_dir sim_packages_dir sim_build_dir sim_scripts_dir USE_OGL OGLHOME clhep_version_dot clhep clhep_version clhep_package_dir clhep_base_dir clep_build_dir clhep_tgz_local clhep_dir_orig clhep_download clhep_config_opts gdml gdml_version gdml_package_dir gdml_base_dir gdml_build_dir gdml_tgz_local gdml_dir_!
 orig gdml_download gdml_config_opts g4system geant4_version_download geant4 geant4_version geant4_package_dir geant4_base_dir geant4_build_dir geant4_tgz_local geant4_dir_orig geant4_download lcdd lcdd_version lcdd_package_dir lcdd_base_dir lcdd_build_dir lcdd_cvsroot lcio lcio_version lcio_package_dir lcio_base_dir lcio_build_dir lcio_cvsroot lcphys lcphys_version lcphys_package_dir lcphys_base_dir lcphys_cvsmodule lcphys_cvsroot slic slic_version slic_package_dir slic_base_dir slic_cvsroot xerces_configure_args xerces_version_underscore xerces xerces_version xerces_package_dir xerces_base_dir xerces_build_dir xerces_config xerces_tgz_local xerces_config_opts xerces_download xerces_dir_orig dist_tarball dist_tarball_current dist_version bin_tarball dist_dir LIBOBJS LTLIBOBJS'

 ac_subst_files=''
 
 # Initialize some variables set by options.

@@ -2148,6 +2148,9 @@

 # initialize SimDist config
 
 

+sim_dist_dir_basename=$(basename `pwd`)
+
+

 packages_dep_order="clhep geant4 lcphys xerces gdml lcio lcdd slic"
 
 

@@ -3562,9 +3565,12 @@

 
 dist_version=$(echo ${slic_version} | sed -e 's/[a-z]/\_/g' -e 's/^_//g')
 

-dist_tarball="slic-"${dist_version}"-"${platform}"-bin".tar.gz

+dist_tarball="slic-"${dist_version}"-"${platform}"-dist".tar.gz
+
+dist_tarball_current="slic-current-"${platform}"-dist".tar.gz
+
+bin_tarball="slic-"${dist_version}"-"${platform}"-bin".tar.gz

-dist_tarball_current="slic-current-"${platform}"-bin".tar.gz

@@ -4309,6 +4315,7 @@

 s,@platform@,$platform,;t t
 s,@compiler@,$compiler,;t t
 s,@os_shared_libs_var@,$os_shared_libs_var,;t t

+s,@sim_dist_dir_basename@,$sim_dist_dir_basename,;t t

 s,@packages_dep_order@,$packages_dep_order,;t t
 s,@packages_reverse_dep_order@,$packages_reverse_dep_order,;t t
 s,@download_script@,$download_script,;t t

@@ -4388,6 +4395,7 @@

 s,@dist_tarball@,$dist_tarball,;t t
 s,@dist_tarball_current@,$dist_tarball_current,;t t
 s,@dist_version@,$dist_version,;t t

+s,@bin_tarball@,$bin_tarball,;t t

 s,@dist_dir@,$dist_dir,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t

diff -N dist.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ dist.m4	30 Jan 2006 21:29:08 -0000	1.1
@@ -0,0 +1,42 @@

+dnl macro to set the name of the dist tarball
+AC_DEFUN(DIST_TGZ, [
+
+dnl dist version is the same as slic version
+dist_version=$(echo ${slic_version} | sed -e 's/[[a-z]]/\_/g' -e 's/^_//g')
+
+dnl versioned tarball name
+dist_tarball="slic-"${dist_version}"-"${platform}"-dist".tar.gz
+
+dnl non-versioned tarball name
+dist_tarball_current="slic-current-"${platform}"-dist".tar.gz
+
+dnl versioned tarball containing binary, xerces, and runscript 
+bin_tarball="slic-"${dist_version}"-"${platform}"-bin".tar.gz
+
+dnl substitute to common.gmk
+AC_SUBST(dist_tarball)
+AC_SUBST(dist_tarball_current)
+AC_SUBST(dist_version)
+AC_SUBST(bin_tarball)
+
+])
+
+dnl macro to allow selection of where tarball should be copied; default to SLAC location
+AC_DEFUN(WITH_UPLOAD_DIR, [
+
+AC_MSG_CHECKING(for dist directory)
+
+dnl This won't work for anyone but Jeremy McCormick (SLAC).
+slac_dist="[log in to unmask]:/nfs/slac/g/lcd/mc/prj/www/lcsim/dist/slic"
+
+dnl Set the SCP-style destination directory
+AC_ARG_WITH(distdir,
+            AC_HELP_STRING([--with-distdir=<path>], [Set SCP-style dist directory in form username@host:dir]),
+            dist_dir=$with_distdir,
+            dist_dir=$slac_dist)
+
+AC_SUBST(dist_dir)
+
+AC_MSG_RESULT($dist_dir)
+
+])

diff -N tgz.m4
--- tgz.m4	28 Jan 2006 01:32:20 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@

-dnl macro to set the name of the dist tarball
-AC_DEFUN(DIST_TGZ, [
-
-dnl dist version is the same as slic version
-dist_version=$(echo ${slic_version} | sed -e 's/[[a-z]]/\_/g' -e 's/^_//g')
-
-dnl versioned tarball name
-dist_tarball="slic-"${dist_version}"-"${platform}"-bin".tar.gz
-
-dnl non-versioned tarball name
-dist_tarball_current="slic-current-"${platform}"-bin".tar.gz
-
-dnl substitute to common.gmk
-AC_SUBST(dist_tarball)
-AC_SUBST(dist_tarball_current)
-AC_SUBST(dist_version)
-
-])
-
-dnl macro to allow selection of where tarball should be copied; default to SLAC location
-AC_DEFUN(WITH_UPLOAD_DIR, [
-
-AC_MSG_CHECKING(for dist directory)
-
-dnl This won't work for anyone but Jeremy McCormick (SLAC).
-slac_dist="[log in to unmask]:/nfs/slac/g/lcd/mc/prj/www/lcsim/dist/slic"
-
-dnl Set the SCP-style destination directory
-AC_ARG_WITH(distdir,
-            AC_HELP_STRING([--with-distdir=<path>], [Set SCP-style dist directory in form username@host:dir]),
-            dist_dir=$with_distdir,
-            dist_dir=$slac_dist)
-
-AC_SUBST(dist_dir)
-
-AC_MSG_RESULT($dist_dir)
-
-])

\ No newline at end of file