[blfs-book] r12785 - in trunk/BOOK: general/prog multimedia/videoutils x/installing

bdubbs at higgs.linuxfromscratch.org bdubbs at higgs.linuxfromscratch.org
Tue Feb 25 13:04:59 PST 2014


Author: bdubbs
Date: Tue Feb 25 13:04:58 2014
New Revision: 12785

Log:
Revert ghandes to guile

Modified:
   trunk/BOOK/general/prog/guile.xml
   trunk/BOOK/multimedia/videoutils/ffmpeg.xml
   trunk/BOOK/x/installing/libva.xml

Modified: trunk/BOOK/general/prog/guile.xml
==============================================================================
--- trunk/BOOK/general/prog/guile.xml	Tue Feb 25 12:36:27 2014	(r12784)
+++ trunk/BOOK/general/prog/guile.xml	Tue Feb 25 13:04:58 2014	(r12785)
@@ -98,7 +98,9 @@
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr --disable-static &&
+<screen><userinput>./configure --prefix=/usr    \
+            --disable-static \
+            --docdir=/usr/share/doc/guile-&guile-version; &&
 make      &&
 make html &&
 
@@ -106,17 +108,6 @@
 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 &&
-unset DIRNAME</userinput></screen>
-
-    <para>
       To test the results, issue: <command>make check</command>.
     </para>
 
@@ -124,37 +115,20 @@
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>make install &&
+<screen role="root"><userinput>make install      &&
+make install-html &&
+
+mv /usr/share/doc/guile-&guile-version;/{guile.html,ref} &&
+mv /usr/share/doc/guile-&guile-version;/r5rs{.html,}     &&
 
-find examples -name "Makefile*" -delete      &&
-install -v -dm755 /usr/share/doc/guile-&guile-version; &&
-cp -vR examples   /usr/share/doc/guile-&guile-version; &&
+find examples -name "Makefile*" -delete &&
+cp -vR examples   /usr/share/doc/guile-&guile-version;   &&
 
 for DIRNAME in r5rs ref; do
-  install -v -dm755 /usr/share/doc/guile-&guile-version;/${DIRNAME} &&
-  
   install -v -m644  doc/${DIRNAME}/*.txt \
-                    /usr/share/doc/guile-&guile-version;/${DIRNAME} &&
-  
-  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 &&
+unset DIRNAME</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/multimedia/videoutils/ffmpeg.xml
==============================================================================
--- trunk/BOOK/multimedia/videoutils/ffmpeg.xml	Tue Feb 25 12:36:27 2014	(r12784)
+++ trunk/BOOK/multimedia/videoutils/ffmpeg.xml	Tue Feb 25 13:04:58 2014	(r12785)
@@ -183,8 +183,9 @@
             --enable-libx264     \
             --enable-x11grab     &&
 make &&
-gcc tools/qt-faststart.c -o tools/qt-faststart &&
-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

Modified: trunk/BOOK/x/installing/libva.xml
==============================================================================
--- trunk/BOOK/x/installing/libva.xml	Tue Feb 25 12:36:27 2014	(r12784)
+++ trunk/BOOK/x/installing/libva.xml	Tue Feb 25 13:04:58 2014	(r12785)
@@ -50,7 +50,7 @@
        subpicture blending, and rendering.
     </para>
 
-    &lfs74_built;
+    &lfs75_built;
 
     <bridgehead renderas="sect4">Package Information</bridgehead>
     <itemizedlist spacing="compact">



More information about the blfs-book mailing list