|
[Rivet-svn] rivet: Out-of-source build fix in doc/Rivet Mercurial rivet at projects.hepforge.orgWed Jan 17 15:00:01 GMT 2018
details: https://rivet.hepforge.org/hg/rivet/rev/e7772bab214f branches: release-2-6-x changeset: 6217:e7772bab214f user: David Grellscheid <david.grellscheid at durham.ac.uk> date: Wed Jan 17 14:58:01 2018 +0000 description: Out-of-source build fix in doc/ diffs (42 lines): --- a/doc/Makefile.am Wed Jan 17 14:37:52 2018 +0000 +++ b/doc/Makefile.am Wed Jan 17 14:58:01 2018 +0000 @@ -17,21 +17,21 @@ if ENABLE_PYEXT DOCS += analyses.html DOCDIRS += analyses -analyses.html: $(top_srcdir)/analyses mk-analysis-html +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) \ PYTHONPATH=$(YODA_PYTHONPATH):$(RIVET_PYTHONPATH):$(PYTHONPATH) \ - $(PYTHON) mk-analysis-html + $(PYTHON) $(srcdir)/mk-analysis-html endif if ENABLE_PYEXT DOCS += analyses.json -analyses.json: $(top_srcdir)/analyses mk-analysis-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) \ PYTHONPATH=$(YODA_PYTHONPATH):$(RIVET_PYTHONPATH):$(PYTHONPATH) \ - $(PYTHON) mk-analysis-json + $(PYTHON) $(srcdir)/mk-analysis-json endif @@ -52,11 +52,11 @@ DOCS += rivet-manual.pdf if ENABLE_PYEXT -analyses.bib analyses.tex: $(top_srcdir)/analyses mk-analysis-latex +analyses.bib analyses.tex: $(top_srcdir)/analyses $(srcdir)/mk-analysis-latex 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) \ PYTHONPATH=$(YODA_PYTHONPATH):$(RIVET_PYTHONPATH):$(PYTHONPATH) \ - $(PYTHON) mk-analysis-latex + $(PYTHON) $(srcdir)/mk-analysis-latex else analyses.bib analyses.tex: > analyses.tex
More information about the Rivet-svn mailing list |