[blfs-book] r12780 - trunk/BOOK/general/prog

pierre at higgs.linuxfromscratch.org pierre at higgs.linuxfromscratch.org
Mon Feb 24 13:49:43 PST 2014


Author: pierre
Date: Mon Feb 24 13:49:43 2014
New Revision: 12780

Log:
two more tags

Modified:
   trunk/BOOK/general/prog/guile.xml
   trunk/BOOK/general/prog/php.xml

Modified: trunk/BOOK/general/prog/guile.xml
==============================================================================
--- trunk/BOOK/general/prog/guile.xml	Mon Feb 24 08:02:37 2014	(r12779)
+++ trunk/BOOK/general/prog/guile.xml	Mon Feb 24 13:49:43 2014	(r12780)
@@ -35,7 +35,7 @@
       contains a stand alone <application>Scheme</application> interpreter.
     </para>
 
-    &lfs74_checked;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -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,36 +115,21 @@
       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*" -exec rm {} \; &&
-install -v -dm755 /usr/share/doc/guile-&guile-version; &&
-cp -vR examples   /usr/share/doc/guile-&guile-version; &&
+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/general/prog/php.xml
==============================================================================
--- trunk/BOOK/general/prog/php.xml	Mon Feb 24 08:02:37 2014	(r12779)
+++ trunk/BOOK/general/prog/php.xml	Mon Feb 24 13:49:43 2014	(r12780)
@@ -34,7 +34,7 @@
     directly embedded into the HTML markup.  It is also useful as a
     general purpose scripting language.</para>
 
-    &lfs74_checked;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">



More information about the blfs-book mailing list