Changeset 0ee2aa3

Timestamp:

02/25/2014 09:04:58 PM (9 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 7.10, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, ken/inkscape-core-mods, krejzi/svn, lazarus, nosym, perl-modules, plabs/python-mods, qt5new, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226

Children:

ff0a4dc

Parents:

13103ed

Message:

Revert ghandes to guile

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@12785 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general/prog/guile.xml (modified) (2 diffs)
• multimedia/videoutils/ffmpeg.xml (modified) (1 diff)
• x/installing/libva.xml (modified) (1 diff)

general/prog/guile.xml

@@ -99 +99 @@
     </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;
@@ -107 +109 @@
 
     <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
+      To test the results, issue: <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install      &amp;&amp;
+make install-html &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 -m644  doc/${DIRNAME}/*.txt \
+                    /usr/share/doc/guile-&guile-version;/${DIRNAME}
 done &amp;&amp;
 unset DIRNAME</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &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;
-
-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>
 
   </sect2>

multimedia/videoutils/ffmpeg.xml

@@ -184 +184 @@
             --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>

x/installing/libva.xml

@@ -51 +51 @@
     </para>
 
-    &lfs74_built;
+    &lfs75_built;
 
     <bridgehead renderas="sect4">Package Information</bridgehead>