[Rivet-svn] r1809 - trunk/doc

[blackhole at projects.hepforge.org]

Author: buckley
Date: Wed Sep  2 14:29:32 2009
New Revision: 1809

Log:
Making doc build work using new support for RIVET_DATA_PATH

Modified:
   trunk/doc/Makefile.am
   trunk/doc/mk-analysis-latex

Modified: trunk/doc/Makefile.am
==============================================================================
--- trunk/doc/Makefile.am	Wed Sep  2 14:29:07 2009	(r1808)
+++ trunk/doc/Makefile.am	Wed Sep  2 14:29:32 2009	(r1809)
@@ -11,6 +11,7 @@
 analyses.html: $(top_srcdir)/include/Rivet/Analyses mk-analysis-html
 	LD_LIBRARY_PATH=$(top_srcdir)/src/.libs:$(FASTJETLIBPATH):$(HEPMCLIBPATH):$(LD_LIBRARY_PATH):$(prefix)/lib \
 DYLD_LIBRARY_PATH=$(top_srcdir)/src/.libs:$(FASTJETLIBPATH):$(HEPMCLIBPATH):$(DYLD_LIBRARY_PATH):$(prefix)/lib \
+RIVET_DATA_PATH=$(top_srcdir)/data/anainfo \
 ./mk-analysis-html analyses.html
 
 
@@ -22,6 +23,7 @@
 analyses.tex: $(top_srcdir)/include/Rivet/Analyses mk-analysis-latex
 	LD_LIBRARY_PATH=$(top_srcdir)/src/.libs:$(FASTJETLIBPATH):$(HEPMCLIBPATH):$(LD_LIBRARY_PATH):$(prefix)/lib \
 DYLD_LIBRARY_PATH=$(top_srcdir)/src/.libs:$(FASTJETLIBPATH):$(HEPMCLIBPATH):$(DYLD_LIBRARY_PATH):$(prefix)/lib \
+RIVET_DATA_PATH=$(top_srcdir)/data/anainfo \
 ./mk-analysis-latex analyses.tex
 
 #LATEX	= pdflatex

Modified: trunk/doc/mk-analysis-latex
==============================================================================
--- trunk/doc/mk-analysis-latex	Wed Sep  2 14:29:07 2009	(r1808)
+++ trunk/doc/mk-analysis-latex	Wed Sep  2 14:29:32 2009	(r1809)
@@ -21,7 +21,7 @@
 
 
 ## Get input paths to allow rivet module to be imported from the src dir
-import os, re
+import os, re, glob
 pybuild = os.path.abspath(os.path.join(os.getcwd(), "..", "pyext", "build"))
 dirs = []
 for d in os.listdir(pybuild):
@@ -30,8 +30,9 @@
 sys.path = dirs + sys.path
 os.environ["LD_LIBRARY_PATH"] = os.environ["LD_LIBRARY_PATH"] + ":" + \
     os.path.abspath(os.path.join(os.getcwd(), "..", "src", ".libs"))
-os.environ["RIVET_ANALYSIS_PATH"] = \
-    os.path.abspath(os.path.join(os.getcwd(), "..", "src", "Analyses", ".libs"))
+anadirs = glob.glob(os.path.join(os.getcwd(), "..", "src", "Analyses", "*", ".libs"))
+#print anadirs
+os.environ["RIVET_ANALYSIS_PATH"] = ":".join(anadirs)
 
         
 ## Change dlopen status to GLOBAL for Rivet lib