[Rivet-svn] r3285 - trunk

[blackhole at projects.hepforge.org]

Author: buckley
Date: Sun Aug  7 17:04:16 2011
New Revision: 3285

Log:
Adding TEXINPUTS and LATEXINPUTS prepend definitions to the variables provided by rivetenv.(c)sh. Without these, make-plots could be broken on lxplus

Modified:
   trunk/ChangeLog
   trunk/rivetenv.csh.in
   trunk/rivetenv.sh.in

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Sun Aug  7 16:59:20 2011	(r3284)
+++ trunk/ChangeLog	Sun Aug  7 17:04:16 2011	(r3285)
@@ -1,3 +1,11 @@
+2011-08-07  Andy Buckley  <andy at insectnation.org>
+
+	* Adding TEXINPUTS and LATEXINPUTS prepend definitions to the
+	variables provided by rivetenv.(c)sh. A manual setting of these
+	variables that didn't include the Rivet TEXMFHOME path was
+	breaking make-plots on lxplus, presumably since the system LaTeX
+	packages are so old there.
+
 2011-08-02  Frank Siegert  <frank.siegert at cern.ch>
 
 	Version 1.6.0 release!

Modified: trunk/rivetenv.csh.in
==============================================================================
--- trunk/rivetenv.csh.in	Sun Aug  7 16:59:20 2011	(r3284)
+++ trunk/rivetenv.csh.in	Sun Aug  7 17:04:16 2011	(r3285)
@@ -23,3 +23,15 @@
 else
 setenv HOMETEXMF "@datadir@/Rivet/texmf"
 endif
+
+if ($?TEXINPUTS) then
+setenv TEXINPUTS "@datadir@/Rivet/texmf:$TEXINPUTS"
+else
+setenv TEXINPUTS "@datadir@/Rivet/texmf/tex//"
+endif
+
+if ($?LATEXINPUTS) then
+setenv LATEXINPUTS "@datadir@/Rivet/texmf:$LATEXINPUTS"
+else
+setenv LATEXINPUTS "@datadir@/Rivet/texmf/tex//"
+endif

Modified: trunk/rivetenv.sh.in
==============================================================================
--- trunk/rivetenv.sh.in	Sun Aug  7 16:59:20 2011	(r3284)
+++ trunk/rivetenv.sh.in	Sun Aug  7 17:04:16 2011	(r3285)
@@ -6,9 +6,12 @@
 export PATH="$exec_prefix/bin:$PATH"
 export @LIBPATHVARNAME@="@libdir@:@HEPMCLIBPATH@:@FASTJETLIBPATH@:$@LIBPATHVARNAME@"
 export PYTHONPATH="@RIVET_PYTHONPATH@:$PYTHONPATH"
+
 export TEXMFHOME="@datadir@/Rivet/texmf:$TEXMFHOME"
 export HOMETEXMF="@datadir@/Rivet/texmf:$HOMETEXMF"
 export TEXMFCNF="@datadir@/Rivet/texmf/cnf:$TEXMFCNF"
+export TEXINPUTS="@datadir@/Rivet/texmf/tex//:$TEXINPUTS"
+export LATEXINPUTS="@datadir@/Rivet/texmf/tex//:$LATEXINPUTS"
 
 if (complete &> /dev/null); then
     test -e "@datadir@/Rivet/rivet-completion" && source "@datadir@/Rivet/rivet-completion"