SimDist

diff -u -r1.31 -r1.32
--- configure.in	2 Aug 2012 23:25:30 -0000	1.31
+++ configure.in	3 Aug 2012 01:38:31 -0000	1.32
@@ -1,4 +1,4 @@

-dnl $Header: /cvs/lcd/SimDist/configure.in,v 1.31 2012/08/02 23:25:30 jeremy Exp $

+dnl $Header: /cvs/lcd/SimDist/configure.in,v 1.32 2012/08/03 01:38:31 jeremy Exp $

 dnl
 dnl Process this file with autoconf to produce the configure script for SimDist.
 dnl

@@ -18,6 +18,7 @@

 clhep_version="v2r1p0_1"
 gdml_version="HEAD"
 geant4_version="v9r5p01"

+AC_SUBST(geant4_version)

 dnl HepPDT version.
 heppdt_version="3.03.02"
 lcdd_version="HEAD"

@@ -125,13 +126,15 @@

 AC_ADD_CONFIG_FILE(Makefile)
 AC_ADD_CONFIG_FILE(packages/Makefile)
 AC_ADD_CONFIG_FILE(build/package.gmk)

-dnl AC_ADD_CONFIG_FILE(build/package_versions.gmk)
-dnl AC_ADD_CONFIG_FILE(build/package_versions.txt)

 AC_ADD_CONFIG_FILE(scripts/slic.sh)
 AC_ADD_CONFIG_FILE(scripts/slic-setup.sh)
 AC_ADD_CONFIG_FILE(scripts/slic-ldpath.sh)
 AC_ADD_CONFIG_FILE(scripts/install-libs.sh)
 AC_ADD_CONFIG_FILE(scripts/install-geant4-data.sh)

+AC_ADD_CONFIG_FILE(packages/geant4/patch.sh)
+
+dnl AC_ADD_CONFIG_FILE(build/package_versions.gmk)
+dnl AC_ADD_CONFIG_FILE(build/package_versions.txt)

 
 dnl Remove trailing space from input file list.
 config_files=${config_files%\ }

@@ -144,6 +147,7 @@

 
 dnl Set the permissions on scripts.
 chmod 755 ./scripts/*.sh

+chmod 755 ./packages/geant4/patch.sh

 
 dnl chmod 755 ${sim_scripts_dir}/*.sh
 dnl chmod 755 build.sh

SimDist/packages/geant4

diff -N patch.sh.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patch.sh.in	3 Aug 2012 01:38:31 -0000	1.7
@@ -0,0 +1,18 @@

+#!/bin/sh
+
+# replace pattern
+r='s/ifeq\ (\$(G4SYSTEM),\ WIN32-VC)/ifneq\ (\$(G4LIB_USE_EXPAT),)/g'
+
+# files to change
+f1=./@geant4_version@/source/processes/hadronic/models/lend/GNUmakefile
+f2=./@geant4_version@/source/physics_lists/builders/GNUmakefile
+f3=./@geant4_version@/source/physics_lists/lists/GNUmakefile
+
+# apply the patch
+for f in $f1 $f2 $f3; do
+  echo "patching $f"
+  cp ${f} ${f}.bkp
+  sed -e 's/ifeq (\$(G4SYSTEM), WIN32-VC)/ifneq (\$(G4LIB_USE_EXPAT),)/g' ${f} &> ${f}.tmp
+  cp ${f}.tmp ${f}
+  rm ${f}.tmp
+done

SimDist/packages/geant4

diff -u -r1.23 -r1.24
--- Makefile.in	2 Aug 2012 21:16:18 -0000	1.23
+++ Makefile.in	3 Aug 2012 01:38:31 -0000	1.24
@@ -1,10 +1,10 @@

-# $Header: /cvs/lcd/SimDist/packages/geant4/Makefile.in,v 1.23 2012/08/02 21:16:18 jeremy Exp $

+# $Header: /cvs/lcd/SimDist/packages/geant4/Makefile.in,v 1.24 2012/08/03 01:38:31 jeremy Exp $

 
 # package build settings
 include ../../build/package.gmk
 
 # default build targets

-build_chain := packageinfo debuginfo download config compile install_includes 

+build_chain := packageinfo debuginfo download patch config compile install_includes 

 
 # add G4 data download to targets 
 ifdef SIMDIST_ENABLE_G4DATA

@@ -14,6 +14,7 @@

 # set default make target
 all: $(build_chain)
 

+# force primary build target

 .PHONY: all
 
 # physics lists