On 02/18/2014 03:24 AM, kre...@higgs.linuxfromscratch.org wrote:
> Author: krejzi
> Date: Mon Feb 17 18:24:31 2014
> New Revision: 10478
> 
> Log:
> Random fixes.
> 

Bruce, you might be interested in some of the changes below for LFS,
too. The {a,so} instead of {so,a} is being used for consistency with
other packages. Moving from two to one lines is being used for no good
reason, except that sed instructions use that approach too.

> 
> Modified: branches/systemd/BOOK/chapter05/xz.xml
> ==============================================================================
> --- branches/systemd/BOOK/chapter05/xz.xml    Mon Feb 17 09:40:52 2014        
> (r10477)
> +++ branches/systemd/BOOK/chapter05/xz.xml    Mon Feb 17 18:24:31 2014        
> (r10478)
> @@ -41,7 +41,7 @@
>    </sect2>
>  
>    <sect2 role="installation">
> -    <title>Installation of Xz-Utils</title>
> +    <title>Installation of Xz</title>
>  
>      <para>Prepare Xz for compilation:</para>
>  
> 
> Modified: branches/systemd/BOOK/chapter06/findutils.xml
> ==============================================================================
> --- branches/systemd/BOOK/chapter06/findutils.xml     Mon Feb 17 09:40:52 
> 2014        (r10477)
> +++ branches/systemd/BOOK/chapter06/findutils.xml     Mon Feb 17 18:24:31 
> 2014        (r10478)
> @@ -45,8 +45,7 @@
>  
>      <para>Prepare Findutils for compilation:</para>
>  
> -<screen><userinput remap="configure">./configure --prefix=/usr               
>     \
> -            --localstatedir=/var/lib/locate</userinput></screen>
> +<screen><userinput remap="configure">./configure --prefix=/usr 
> --localstatedir=/var/lib/locate</userinput></screen>
>  
>      <variablelist>
>        <title>The meaning of the configure options:</title>
> 
> Modified: branches/systemd/BOOK/chapter06/flex.xml
> ==============================================================================
> --- branches/systemd/BOOK/chapter06/flex.xml  Mon Feb 17 09:40:52 2014        
> (r10477)
> +++ branches/systemd/BOOK/chapter06/flex.xml  Mon Feb 17 18:24:31 2014        
> (r10478)
> @@ -47,8 +47,7 @@
>  
>      <para>Prepare Flex for compilation:</para>
>  
> -<screen><userinput remap="configure">./configure --prefix=/usr \
> -            --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
> +<screen><userinput remap="configure">./configure --prefix=/usr 
> --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
>  
>      <para>Compile the package:</para>
>  
> @@ -97,7 +96,7 @@
>  
>        <seglistitem>
>          <seg>flex, flex++ (link to flex), and lex</seg>
> -        <seg>libfl.{so,a} and libfl_pic.{so.a}</seg>
> +        <seg>libfl.{a,so} and libfl_pic.{a,so}</seg>
>          <seg>/usr/share/doc/flex-&flex-version;</seg>
>        </seglistitem>
>      </segmentedlist>
> @@ -141,12 +140,12 @@
>          </listitem>
>        </varlistentry>
>  
> -      <varlistentry id="libfl.so">
> -        <term><filename class="libraryfile">libfl.so</filename></term>
> +      <varlistentry id="libfl">
> +        <term><filename class="libraryfile">libfl</filename></term>
>          <listitem>
>            <para>The <filename class="libraryfile">flex</filename> 
> library</para>
> -          <indexterm zone="ch-system-flex libfl.so">
> -            <primary sortas="c-libfl.so">libfl.so</primary>
> +          <indexterm zone="ch-system-flex libfl">
> +            <primary sortas="c-libfl">libfl</primary>
>            </indexterm>
>          </listitem>
>        </varlistentry>
> 
> Modified: branches/systemd/BOOK/chapter06/gdbm.xml
> ==============================================================================
> --- branches/systemd/BOOK/chapter06/gdbm.xml  Mon Feb 17 09:40:52 2014        
> (r10477)
> +++ branches/systemd/BOOK/chapter06/gdbm.xml  Mon Feb 17 18:24:31 2014        
> (r10478)
> @@ -83,7 +83,7 @@
>  
>        <seglistitem>
>          <seg>testgdbm</seg>
> -        <seg>libgdbm.{so,a} and libgdbm_compat.{so,a}</seg>
> +        <seg>libgdbm.{a,so} and libgdbm_compat.{a,so}</seg>
>        </seglistitem>
>      </segmentedlist>
>  
> 
> Modified: branches/systemd/BOOK/chapter06/gettext.xml
> ==============================================================================
> --- branches/systemd/BOOK/chapter06/gettext.xml       Mon Feb 17 09:40:52 
> 2014        (r10477)
> +++ branches/systemd/BOOK/chapter06/gettext.xml       Mon Feb 17 18:24:31 
> 2014        (r10478)
> @@ -45,8 +45,7 @@
>  
>      <para>Prepare Gettext for compilation:</para>
>  
> -<screen><userinput remap="configure">./configure --prefix=/usr \
> -            
> --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
> +<screen><userinput remap="configure">./configure --prefix=/usr 
> --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
>  
>      <para>Compile the package:</para>
>  
> 
> Modified: branches/systemd/BOOK/chapter06/glibc.xml
> ==============================================================================
> --- branches/systemd/BOOK/chapter06/glibc.xml Mon Feb 17 09:40:52 2014        
> (r10477)
> +++ branches/systemd/BOOK/chapter06/glibc.xml Mon Feb 17 18:24:31 2014        
> (r10478)
> @@ -81,9 +81,9 @@
>      <para>Prepare Glibc for compilation:</para>
>  
>  <screen><userinput remap="configure">../glibc-&glibc-version;/configure      
>     \
> -    --prefix=/usr                \
> -    --disable-profile            \
> -    --enable-kernel=&min-kernel;       \
> +    --prefix=/usr          \
> +    --disable-profile      \
> +    --enable-kernel=&min-kernel; \
>      --enable-obsolete-rpc</userinput></screen>
>  
>      <variablelist>
> 
> Modified: branches/systemd/BOOK/chapter06/mpfr.xml
> ==============================================================================
> --- branches/systemd/BOOK/chapter06/mpfr.xml  Mon Feb 17 09:40:52 2014        
> (r10477)
> +++ branches/systemd/BOOK/chapter06/mpfr.xml  Mon Feb 17 18:24:31 2014        
> (r10478)
> @@ -43,9 +43,9 @@
>  
>      <para>Prepare MPFR for compilation:</para>
>  
> -<screen><userinput remap="configure">./configure  --prefix=/usr        \
> -             --enable-thread-safe \
> -             --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
> +<screen><userinput remap="configure">./configure --prefix=/usr        \
> +            --enable-thread-safe \
> +            --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
>  
>      <para>Compile the package:</para>
>  
> 
> Modified: branches/systemd/BOOK/chapter06/xz.xml
> ==============================================================================
> --- branches/systemd/BOOK/chapter06/xz.xml    Mon Feb 17 09:40:52 2014        
> (r10477)
> +++ branches/systemd/BOOK/chapter06/xz.xml    Mon Feb 17 18:24:31 2014        
> (r10478)
> @@ -46,8 +46,7 @@
>  
>      <para>Prepare Xz for compilation with:</para>
>  
> -<screen><userinput remap="configure">./configure --prefix=/usr \
> -            --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
> +<screen><userinput remap="configure">./configure --prefix=/usr 
> --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
>  
>      <para>Compile the package:</para>
>  
> 


-- 
Note: My last name is not Krejzi.
-- 
http://linuxfromscratch.org/mailman/listinfo/lfs-dev
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page

Reply via email to