From 0ee2aa38021e90d4552610b05b580e65998a05ee Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Tue, 25 Feb 2014 21:04:58 +0000
Subject: [PATCH] Revert ghandes to guile

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@12785 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/prog/guile.xml           | 50 ++++++++------------------------
 multimedia/videoutils/ffmpeg.xml |  5 ++--
 x/installing/libva.xml           |  2 +-
 3 files changed, 16 insertions(+), 41 deletions(-)

diff --git a/general/prog/guile.xml b/general/prog/guile.xml
index 0c89d12910..f466583241 100644
--- a/general/prog/guile.xml
+++ b/general/prog/guile.xml
@@ -98,24 +98,15 @@
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+<screen><userinput>./configure --prefix=/usr    \
+            --disable-static \
+            --docdir=/usr/share/doc/guile-&guile-version; &amp;&amp;
 make      &amp;&amp;
 make html &amp;&amp;
 
 makeinfo --plaintext -o doc/r5rs/r5rs.txt doc/r5rs/r5rs.texi &amp;&amp;
 makeinfo --plaintext -o doc/ref/guile.txt doc/ref/guile.texi</userinput></screen>
 
-    <para>
-      If you have <xref linkend="texlive"/> installed and wish to build alternate
-      formats (PDF and postscript) of the documentation, issue the following
-      commands:
-    </para>
-
-<screen><userinput>for DIRNAME in r5rs ref; do
-   make -k -C doc/${DIRNAME} pdf ps
-done &amp;&amp;
-unset DIRNAME</userinput></screen>
-
     <para>
       To test the results, issue: <command>make check</command>.
     </para>
@@ -124,37 +115,20 @@ unset DIRNAME</userinput></screen>
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>make install &amp;&amp;
+<screen role="root"><userinput>make install      &amp;&amp;
+make install-html &amp;&amp;
 
-find examples -name "Makefile*" -delete      &amp;&amp;
-install -v -dm755 /usr/share/doc/guile-&guile-version; &amp;&amp;
-cp -vR examples   /usr/share/doc/guile-&guile-version; &amp;&amp;
+mv /usr/share/doc/guile-&guile-version;/{guile.html,ref} &amp;&amp;
+mv /usr/share/doc/guile-&guile-version;/r5rs{.html,}     &amp;&amp;
+
+find examples -name "Makefile*" -delete &amp;&amp;
+cp -vR examples   /usr/share/doc/guile-&guile-version;   &amp;&amp;
 
 for DIRNAME in r5rs ref; do
-  install -v -dm755 /usr/share/doc/guile-&guile-version;/${DIRNAME} &amp;&amp;
-  
   install -v -m644  doc/${DIRNAME}/*.txt \
-                    /usr/share/doc/guile-&guile-version;/${DIRNAME} &amp;&amp;
-  
-  if [ -d           doc/${DIRNAME}/${DIRNAME}.html ]; then
-    cp -Rv          doc/${DIRNAME}/${DIRNAME}.html \
                     /usr/share/doc/guile-&guile-version;/${DIRNAME}
-  fi
-done
-
-cp -vR doc/ref/guile.html /usr/share/doc/guile-&guile-version;/ref</userinput></screen>
-
-    <para>
-      If you built the alternate formats of the documentation, install them
-      using the following commands issued by the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>for DIRNAME in r5rs ref
-do
-  install -v -m644 doc/${DIRNAME}/*.{pdf,ps,dvi} \
-                   /usr/share/doc/guile-&guile-version;/${DIRNAME}
-done</userinput></screen>
+done &amp;&amp;
+unset DIRNAME</userinput></screen>
 
   </sect2>
 
diff --git a/multimedia/videoutils/ffmpeg.xml b/multimedia/videoutils/ffmpeg.xml
index 72744ca330..0b2ccd61b1 100644
--- a/multimedia/videoutils/ffmpeg.xml
+++ b/multimedia/videoutils/ffmpeg.xml
@@ -183,8 +183,9 @@
             --enable-libx264     \
             --enable-x11grab     &amp;&amp;
 make &amp;&amp;
-gcc tools/qt-faststart.c -o tools/qt-faststart &amp;&amp;
-unset LIBRARY_PATH</userinput></screen>
+gcc tools/qt-faststart.c -o tools/qt-faststart</userinput></screen>
+<!--
+unset LIBRARY_PATH</userinput></screen>-->
 
     <para>
       HTML documentation was built in the previous step if
diff --git a/x/installing/libva.xml b/x/installing/libva.xml
index 8da8bb6aa1..d514186d8e 100644
--- a/x/installing/libva.xml
+++ b/x/installing/libva.xml
@@ -50,7 +50,7 @@
        subpicture blending, and rendering.
     </para>
 
-    &lfs74_built;
+    &lfs75_built;
 
     <bridgehead renderas="sect4">Package Information</bridgehead>
     <itemizedlist spacing="compact">