[Rivet-svn] r2208 - trunk/bin

[blackhole at projects.hepforge.org]

Author: buckley
Date: Fri Jan 15 16:47:44 2010
New Revision: 2208

Log:
Typo fix and more selective installation of rivet-specific Python scripts

Modified:
   trunk/bin/Makefile.am
   trunk/bin/rivet

Modified: trunk/bin/Makefile.am
==============================================================================
--- trunk/bin/Makefile.am	Wed Jan 13 19:59:58 2010	(r2207)
+++ trunk/bin/Makefile.am	Fri Jan 15 16:47:44 2010	(r2208)
@@ -1,9 +1,18 @@
 bin_SCRIPTS = rivet-config 
+
 dist_bin_SCRIPTS = \
 	aida2flat aida2root \
-	compare-histos make-plots \
+	compare-histos make-plots
+EXTRA_DIST = flat2aida
+
+RIVETPROGS = \
     rivet \
     rivet-mkanalysis rivet-buildplugin \
     rivet-chopbins rivet-rmgaps rivet-rescale \
     rivet-mergeruns rivet-mkhtml
-EXTRA_DIST = flat2aida
+
+if ENABLE_PYEXT
+dist_bin_SCRIPTS += $(RIVETPROGS)
+else
+EXTRA_DIST += $(RIVETPROGS)
+endif

Modified: trunk/bin/rivet
==============================================================================
--- trunk/bin/rivet	Wed Jan 13 19:59:58 2010	(r2207)
+++ trunk/bin/rivet	Fri Jan 15 16:47:44 2010	(r2208)
@@ -388,7 +388,7 @@
 evtfile = HEPMCFILES[0]
 logging.info("Reading events from '%s'" % evtfile)
 if not run.init(evtfile):
-    log.error("Failed to initialise on event file %s" % evtfile)
+    logging.error("Failed to initialise on event file %s" % evtfile)
     sys.exit(2)
 
 ## Now that we have some idea of the run contents, init the analysis handler