[Rivet-svn] rivet: OS X build fix in doc

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/a29af6f13fd1
branches:  release-2-6-x
changeset: 6218:a29af6f13fd1
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Thu Jan 25 22:51:12 2018 +0000
description:
OS X build fix in doc

diffs (37 lines):

--- a/doc/Makefile.am	Wed Jan 17 14:58:01 2018 +0000
+++ b/doc/Makefile.am	Thu Jan 25 22:51:12 2018 +0000
@@ -18,8 +18,8 @@
 DOCS += analyses.html
 DOCDIRS += analyses
 analyses.html: $(top_srcdir)/analyses $(srcdir)/mk-analysis-html
-	LD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(YAML_CPPLIBPATH):$(FASTJETLIBPATH):$(HEPMCLIBPATH):$(YODALIBPATH):$(LD_LIBRARY_PATH) \
-    DYLD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(YAML_CPPLIBPATH):$(FASTJETLIBPATH):$(HEPMCLIBPATH):$(YODALIBPATH):$(DYLD_LIBRARY_PATH) \
+	LD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(LD_LIBRARY_PATH) \
+    DYLD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(DYLD_LIBRARY_PATH) \
     PYTHONPATH=$(YODA_PYTHONPATH):$(RIVET_PYTHONPATH):$(PYTHONPATH) \
     $(PYTHON) $(srcdir)/mk-analysis-html
 endif
@@ -28,8 +28,8 @@
 if ENABLE_PYEXT
 DOCS += analyses.json
 analyses.json: $(top_srcdir)/analyses $(srcdir)/mk-analysis-json
-	LD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(YAML_CPPLIBPATH):$(FASTJETLIBPATH):$(HEPMCLIBPATH):$(YODALIBPATH):$(LD_LIBRARY_PATH) \
-    DYLD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(YAML_CPPLIBPATH):$(FASTJETLIBPATH):$(HEPMCLIBPATH):$(YODALIBPATH):$(DYLD_LIBRARY_PATH) \
+	LD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(LD_LIBRARY_PATH) \
+    DYLD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(DYLD_LIBRARY_PATH) \
     PYTHONPATH=$(YODA_PYTHONPATH):$(RIVET_PYTHONPATH):$(PYTHONPATH) \
     $(PYTHON) $(srcdir)/mk-analysis-json
 endif
--- a/doc/mk-analysis-html	Wed Jan 17 14:58:01 2018 +0000
+++ b/doc/mk-analysis-html	Thu Jan 25 22:51:12 2018 +0000
@@ -204,7 +204,9 @@
     #print(aname)
     ANAFILE = os.path.join(OUTDIR, aname+'.html')
     f = open(ANAFILE, "wb")
-    outstr = unicode(head + page + foot)
+    outstr = head + page + foot
+    if type(u'') != str:
+        outstr = unicode(outstr)
     f.write(outstr.encode(errors="ignore"))
     f.close()