Changeset 3371d81 in sasview for docs

Timestamp:

May 9, 2016 6:59:33 AM (9 years ago)

Author:

wojciech

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

aa4a549

Parents:

aff7904 (diff), 1d5f5c2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

setup.py fixed. Merged with Master

File:

• docs/sphinx-docs/Makefile (modified) (2 diffs)

docs/sphinx-docs/Makefile

@@ -118 +118 @@
         $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
         @echo "Running LaTeX files through pdflatex..."
-        $(MAKE) -C $(BUILDDIR)/latex all-pdf
+        "$(MAKE)" -C $(BUILDDIR)/latex all-pdf
         @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
 
@@ -124 +124 @@
         $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
         @echo "Running LaTeX files through platex and dvipdfmx..."
-        $(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
+        "$(MAKE)" -C $(BUILDDIR)/latex all-pdf-ja
         @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."