[SM-Commit] GIT changes to master grimoire by Eric Sandall (82937929f8f0dc76e6b8df0135bf29475d1f1714)

Eric Sandall scm at sourcemage.org
Wed Oct 6 18:26:08 EDT 2010


GIT changes to master grimoire by Eric Sandall <sandalle at sourcemage.org>:

 utils/gnuplot/BUILD   |    2 ++
 utils/gnuplot/DEPENDS |    7 +------
 utils/gnuplot/HISTORY |    4 ++++
 3 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 82937929f8f0dc76e6b8df0135bf29475d1f1714
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    gnuplot: Disable laTeX tutorials, broken with current texlive 20091107
    
    Transcript written on latex.log.
    fmtutil: /root/.texlive2009/texmf-var/web2c/pdftex/latex.fmt installed.
    ---! /root/.texlive2009/texmf-var/web2c/pdftex/latex.fmt was written by
    pdftex
    (Fatal format file error; I'm stymied)
    make[2]: *** [tutorial.dvi] Error 1
    make[2]: Leaving directory `/usr/src/gnuplot-4.2.6/tutorial'

diff --git a/utils/gnuplot/BUILD b/utils/gnuplot/BUILD
index 9d7ca3d..caba3fc 100755
--- a/utils/gnuplot/BUILD
+++ b/utils/gnuplot/BUILD
@@ -1,3 +1,5 @@
+OPTS="--without-tutorial $OPTS" &&
+
 if [[ $GNUPLOT_SCM == "y" ]]; then
   ./prepare
 fi &&
diff --git a/utils/gnuplot/DEPENDS b/utils/gnuplot/DEPENDS
index a1f25aa..709d5ba 100755
--- a/utils/gnuplot/DEPENDS
+++ b/utils/gnuplot/DEPENDS
@@ -20,12 +20,7 @@ optional_depends svgalib               \
                  "--with-linux-vga"    \
                  "--without-linux-vga" \
                  "Linux SVGA console driver?" &&
-if [[ $GNUPLOT_LUA == "n" ]]; then
-  optional_depends texlive                 \
-                 "--with-tutorial"     \
-                 "--without-tutorial"  \
-                 "build LaTeX tutorial?"
-else
+if ! [[ $GNUPLOT_LUA == "n" ]]; then
   depends texlive &&
   depends lua
 fi &&
diff --git a/utils/gnuplot/HISTORY b/utils/gnuplot/HISTORY
index f047103..0e116dd 100644
--- a/utils/gnuplot/HISTORY
+++ b/utils/gnuplot/HISTORY
@@ -1,3 +1,7 @@
+2010-10-06 Eric Sandall <sandalle at sourcemage.org>
+	* DEPENDS: Do not allow building laTeX tutorials (broken)
+	* BUILD: Deisable laTeX tutorials
+
 2010-03-07 Donald Johnson <minozake at codemages.net>
 	* DETAILS: Updated license.  Fixes #15608.
 



More information about the SM-Commit mailing list