Author: manuel Date: 2005-08-17 13:40:45 -0600 (Wed, 17 Aug 2005) New Revision: 6699
Modified: branches/cross-lfs/BOOK/final-system/common/findutils.xml branches/cross-lfs/BOOK/final-system/common/shadow.xml branches/cross-lfs/BOOK/final-system/multilib/findutils.xml branches/cross-lfs/BOOK/final-system/multilib/shadow-64bit.xml branches/cross-lfs/BOOK/final-system/multilib/shadow-n32.xml branches/cross-lfs/BOOK/final-system/multilib/shadow.xml branches/cross-lfs/BOOK/temp-system/64/findutils.xml branches/cross-lfs/BOOK/temp-system/common/findutils.xml branches/cross-lfs/BOOK/temp-system/multilib/findutils.xml Log: Xinclude redo on Findutils and Shadow pages. Modified: branches/cross-lfs/BOOK/final-system/common/findutils.xml =================================================================== --- branches/cross-lfs/BOOK/final-system/common/findutils.xml 2005-08-17 18:31:15 UTC (rev 6698) +++ branches/cross-lfs/BOOK/final-system/common/findutils.xml 2005-08-17 19:40:45 UTC (rev 6699) @@ -48,12 +48,12 @@ <sect2 id="install-findutils" role="installation"> <title>Installation of Findutils</title> - <para>Prepare Findutils for compilation:</para> + <para os="a">Prepare Findutils for compilation:</para> <screen><userinput>./configure --prefix=/usr --libexecdir=/usr/lib/locate \ --localstatedir=/var/lib/locate</userinput></screen> - <variablelist> + <variablelist os="b"> <title>The meaning of the configure options:</title> <varlistentry> @@ -67,16 +67,16 @@ </variablelist> - <para>Compile the package:</para> + <para os="c">Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen os="d"><userinput>make</userinput></screen> - <para>To test the results, issue: + <para os="e">To test the results, issue: <userinput>make check</userinput>.</para> - <para>Install the package:</para> + <para os="f">Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen os="g"><userinput>make install</userinput></screen> </sect2> Modified: branches/cross-lfs/BOOK/final-system/common/shadow.xml =================================================================== --- branches/cross-lfs/BOOK/final-system/common/shadow.xml 2005-08-17 18:31:15 UTC (rev 6698) +++ branches/cross-lfs/BOOK/final-system/common/shadow.xml 2005-08-17 19:40:45 UTC (rev 6699) @@ -46,7 +46,7 @@ <sect2 id="install-shadow" role="installation"> <title>Installation of Shadow</title> - <note> + <note os="a"> <para>If you would like to enforce the use of strong passwords, refer to <ulink url="&blfs-root;view/svn/postlfs/cracklib.html"/> for installing Cracklib prior to building Shadow. Then add @@ -54,11 +54,11 @@ command below.</para> </note> - <para>Prepare Shadow for compilation:</para> + <para os="b">Prepare Shadow for compilation:</para> <screen><userinput>./configure --libdir=/lib --enable-shared --enable-shadowgrp</userinput></screen> - <variablelist> + <variablelist os="c"> <title>The meaning of the new configure options:</title> <varlistentry> @@ -72,35 +72,35 @@ </variablelist> - <para>Disable the installation of the <command>groups</command> program + <para os="d">Disable the installation of the <command>groups</command> program and it's man page, as Coreutils provides a better version:</para> -<screen><userinput>sed -i 's/groups$(EXEEXT) //' src/Makefile +<screen os="e"><userinput>sed -i 's/groups$(EXEEXT) //' src/Makefile sed -i '/groups/d' man/Makefile</userinput></screen> - <para>Compile the package:</para> + <para os="f">Compile the package:</para> -<screen><userinput>make</userinput></screen> +<screen os="g"><userinput>make</userinput></screen> - <para>Install the package:</para> + <para os="h">Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen os="i"><userinput>make install</userinput></screen> - <para id="shadow-limits-login_access">Shadow uses two files to configure + <para id="shadow-limits-login_access" os="j">Shadow uses two files to configure authentication settings for the system. Install these two configuration files:</para> - <indexterm zone="shadow-limits-login_access"> + <indexterm zone="shadow-limits-login_access" os="k"> <primary sortas="e-/etc/limits">/etc/limits</primary> </indexterm> - <indexterm zone="shadow-limits-login_access"> + <indexterm zone="shadow-limits-login_access" os="l"> <primary sortas="e-/etc/login.access">/etc/login.access</primary> </indexterm> -<screen><userinput>cp etc/{limits,login.access} /etc</userinput></screen> +<screen os="m"><userinput>cp etc/{limits,login.access} /etc</userinput></screen> - <para id="shadow-login_defs">Instead of using the default + <para id="shadow-login_defs" os="n">Instead of using the default <emphasis>crypt</emphasis> method, use the more secure <emphasis>MD5</emphasis> method of password encryption, which also allows passwords longer than 8 characters. It is also necessary to change the @@ -110,39 +110,37 @@ these can be accomplished by changing the relevant configuration file while copying it to its destination:</para> - <indexterm zone="shadow-login_defs"> + <indexterm zone="shadow-login_defs" os="o"> <primary sortas="e-/etc/login.defs">/etc/login.defs</primary> </indexterm> - <note> + <note os="p"> <para>If you built Shadow with Cracklib support, insert the following into the <command>sed</command> given below:</para> <screen><literal>-e '[EMAIL PROTECTED]@DICTPATH\t/lib/cracklib/pw_dict@'</literal></screen> </note> -<screen><userinput>sed -e'[EMAIL PROTECTED]@MD5_CRYPT_ENAB yes@' \ +<screen os="q"><userinput>sed -e'[EMAIL PROTECTED]@MD5_CRYPT_ENAB yes@' \ -e 's@/var/spool/mail@/var/mail@' \ etc/login.defs.linux > /etc/login.defs</userinput></screen> - <para>Move a misplaced program to their proper location:</para> + <para os="r">Move a misplaced program to their proper location:</para> -<screen><userinput>mv /usr/bin/passwd /bin</userinput></screen> +<screen os="s"><userinput>mv /usr/bin/passwd /bin</userinput></screen> - <para/> - - <para>Move Shadow's dynamic libraries to a more appropriate + <para os="t">Move Shadow's dynamic libraries to a more appropriate location:</para> -<screen><userinput>mv /lib/libshadow.*a /usr/lib +<screen os="u"><userinput>mv /lib/libshadow.*a /usr/lib rm /lib/libshadow.so ln -sf ../../lib/libshadow.so.0 /usr/lib/libshadow.so</userinput></screen> - <para>The <option>-D</option> option of the <command>useradd</command> + <para os="v">The <option>-D</option> option of the <command>useradd</command> program requires the <filename class="directory">/etc/default</filename> directory for it to work properly:</para> -<screen><userinput>install -d /etc/default</userinput></screen> +<screen os="w"><userinput>install -d /etc/default</userinput></screen> </sect2> Modified: branches/cross-lfs/BOOK/final-system/multilib/findutils.xml =================================================================== --- branches/cross-lfs/BOOK/final-system/multilib/findutils.xml 2005-08-17 18:31:15 UTC (rev 6698) +++ branches/cross-lfs/BOOK/final-system/multilib/findutils.xml 2005-08-17 19:40:45 UTC (rev 6699) @@ -19,10 +19,9 @@ <sect2 id="package-findutils" role="package"> <title/> - <para>The Findutils package contains programs to find files. These programs - are provided to recursively search through a directory tree and to - create, maintain, and search a database (often faster than the recursive - find, but unreliable if the database has not been recently updated).</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/findutils.xml" + xpointer="xpointer(id('package-findutils')/para[1])"/> <segmentedlist> <segtitle>&buildtime;</segtitle> @@ -34,39 +33,45 @@ </seglistitem> </segmentedlist> - <segmentedlist> - <segtitle>&dependencies;</segtitle> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/findutils.xml" + xpointer="xpointer(id('package-findutils')/segmentedlist[2])"/> - <seglistitem> - <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Gettext, Glibc, - Grep, Make and Sed</seg> - </seglistitem> - </segmentedlist> - </sect2> <sect2 id="install-findutils" role="installation"> <title>Installation of Findutils</title> - <para>Prepare Findutils for compilation:</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/findutils.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'a'])"/> <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \ --libexecdir=/usr/lib64/locate --localstatedir=/var/lib64/locate</userinput></screen> - <para>The <parameter>localstatedir</parameter> directive above changes the - location of the <command>locate</command> database to be in <filename - class="directory">/var/lib64/locate</filename>, which is FHS-compliant.</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/findutils.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'b'])"/> - <para>Compile the package:</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/findutils.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/> -<screen><userinput>make</userinput></screen> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/findutils.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'d'])"/> - <para>To test the results, issue: - <userinput>make check</userinput>.</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/findutils.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'e'])"/> - <para>Install the package:</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/findutils.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'f'])"/> -<screen><userinput>make install</userinput></screen> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/findutils.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'g'])"/> </sect2> Modified: branches/cross-lfs/BOOK/final-system/multilib/shadow-64bit.xml =================================================================== --- branches/cross-lfs/BOOK/final-system/multilib/shadow-64bit.xml 2005-08-17 18:31:15 UTC (rev 6698) +++ branches/cross-lfs/BOOK/final-system/multilib/shadow-64bit.xml 2005-08-17 19:40:45 UTC (rev 6699) @@ -42,38 +42,97 @@ <sect2 role="installation"> <title>Installation of Shadow</title> - <para>Prepare Shadow for compilation:</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'a'])"/> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'b'])"/> + <screen><userinput>CC="gcc ${BUILD64}" ./configure --libdir=/lib64 \ --enable-shared</userinput></screen> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../common/shadow.xml" - xpointer="xpointer(id('install-shadow')/para[2])"/> + xpointer="xpointer(//[EMAIL PROTECTED]'d'])"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../common/shadow.xml" - xpointer="xpointer(id('install-shadow')/screen[2])"/> + xpointer="xpointer(//[EMAIL PROTECTED]'e'])"/> - <para>Compile the package:</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'f'])"/> -<screen><userinput>make</userinput></screen> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'g'])"/> - <para>Install the package:</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'h'])"/> -<screen><userinput>make install</userinput></screen> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'i'])"/> - <para>Move a misplaced program to their proper location:</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'j'])"/> -<screen><userinput>mv /usr/bin/passwd /bin</userinput></screen> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'k'])"/> - <para>Move Shadow's dynamic libraries to a more appropriate - location:</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'l'])"/> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'m'])"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'n'])"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'o'])"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'p'])"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'q'])"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'r'])"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'s'])"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'t'])"/> + <screen><userinput>mv /lib64/libshadow.*a /usr/lib64 rm /lib64/libshadow.so ln -sf ../../lib64/libshadow.so.0 /usr/lib64/libshadow.so</userinput></screen> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'v'])"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'w'])"/> + </sect2> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" Modified: branches/cross-lfs/BOOK/final-system/multilib/shadow-n32.xml =================================================================== --- branches/cross-lfs/BOOK/final-system/multilib/shadow-n32.xml 2005-08-17 18:31:15 UTC (rev 6698) +++ branches/cross-lfs/BOOK/final-system/multilib/shadow-n32.xml 2005-08-17 19:40:45 UTC (rev 6699) @@ -42,33 +42,52 @@ <sect2 role="installation"> <title>Installation of Shadow</title> - <para>Prepare Shadow for compilation:</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'a'])"/> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'b'])"/> + <screen><userinput>CC="gcc ${BUILDN32}" ./configure --libdir=/lib32 \ --enable-shared</userinput></screen> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../common/shadow.xml" - xpointer="xpointer(id('install-shadow')/para[2])"/> + xpointer="xpointer(//[EMAIL PROTECTED]'d'])"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../common/shadow.xml" - xpointer="xpointer(id('install-shadow')/screen[2])"/> + xpointer="xpointer(//[EMAIL PROTECTED]'e'])"/> - <para>Compile the package:</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'f'])"/> -<screen><userinput>make</userinput></screen> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'g'])"/> - <para>Install the package:</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'h'])"/> -<screen><userinput>make install</userinput></screen> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'i'])"/> - <para>Move a misplaced program to their proper location:</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'r'])"/> -<screen><userinput>mv /usr/bin/passwd /bin</userinput></screen> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'s'])"/> - <para>Move Shadow's dynamic libraries to a more appropriate - location:</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'t'])"/> <screen><userinput>mv /lib32/libshadow.*a /usr/lib32 rm /lib32/libshadow.so Modified: branches/cross-lfs/BOOK/final-system/multilib/shadow.xml =================================================================== --- branches/cross-lfs/BOOK/final-system/multilib/shadow.xml 2005-08-17 18:31:15 UTC (rev 6698) +++ branches/cross-lfs/BOOK/final-system/multilib/shadow.xml 2005-08-17 19:40:45 UTC (rev 6699) @@ -42,45 +42,60 @@ <sect2 role="installation"> <title>Installation of Shadow</title> - <para>Prepare Shadow for compilation:</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'a'])"/> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'b'])"/> + <screen><userinput>CC="gcc ${BUILD32}" ./configure --libdir=/lib \ - --enable-shared</userinput></screen> + --enable-shared --enable-shadowgrp</userinput></screen> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../common/shadow.xml" - xpointer="xpointer(id('install-shadow')/para[2])"/> + xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../common/shadow.xml" - xpointer="xpointer(id('install-shadow')/screen[2])"/> + xpointer="xpointer(//[EMAIL PROTECTED]'d'])"/> - <para>Compile the package:</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'e'])"/> -<screen><userinput>make</userinput></screen> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'f'])"/> - <para>Install the package:</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'g'])"/> -<screen><userinput>make install</userinput></screen> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'h'])"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../common/shadow.xml" - xpointer="xpointer(id('install-shadow')/para[5]/range-to(id('install-shadow')/para[8]))"/> + xpointer="xpointer(//[EMAIL PROTECTED]'i'])"/> - <para>Move Shadow's dynamic libraries to a more appropriate - location:</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'r'])"/> -<screen><userinput>mv /lib/libshadow.*a /usr/lib -rm /lib/libshadow.so -ln -sf ../../lib/libshadow.so.0 /usr/lib/libshadow.so</userinput></screen> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/shadow.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'s'])"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../common/shadow.xml" - xpointer="xpointer(id('install-shadow')/para[10])"/> + xpointer="xpointer(//[EMAIL PROTECTED]'t'])"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../common/shadow.xml" - xpointer="xpointer(id('install-shadow')/screen[9])"/> + xpointer="xpointer(//[EMAIL PROTECTED]'u'])"/> </sect2> Modified: branches/cross-lfs/BOOK/temp-system/64/findutils.xml =================================================================== --- branches/cross-lfs/BOOK/temp-system/64/findutils.xml 2005-08-17 18:31:15 UTC (rev 6698) +++ branches/cross-lfs/BOOK/temp-system/64/findutils.xml 2005-08-17 19:40:45 UTC (rev 6699) @@ -45,24 +45,34 @@ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../common/findutils.xml" - xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[1])"/> + xpointer="xpointer(//[EMAIL PROTECTED]'aa'])"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../common/findutils.xml" - xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[1])"/> + xpointer="xpointer(//[EMAIL PROTECTED]'ab'])"/> - <para>Prepare Findutils for compilation:</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/findutils.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'a'])"/> <screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \ --host=${LFS_TARGET} --cache-file=config.cache</userinput></screen> - <para>Compile the package:</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/findutils.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/> -<screen><userinput>make</userinput></screen> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/findutils.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'d'])"/> - <para>Install the package:</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/findutils.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'f'])"/> -<screen><userinput>make install</userinput></screen> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/findutils.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'g'])"/> </sect2> Modified: branches/cross-lfs/BOOK/temp-system/common/findutils.xml =================================================================== --- branches/cross-lfs/BOOK/temp-system/common/findutils.xml 2005-08-17 18:31:15 UTC (rev 6698) +++ branches/cross-lfs/BOOK/temp-system/common/findutils.xml 2005-08-17 19:40:45 UTC (rev 6699) @@ -43,23 +43,33 @@ <sect2 role="installation"> <title>Installation of Findutils</title> - <para>Findutils has an issue with cross-compiling where it + <para os="aa">Findutils has an issue with cross-compiling where it can't find getline. So we fix it here:</para> -<screen><userinput>echo "am_cv_func_working_getline=yes" >> config.cache</userinput></screen> +<screen os="ab"><userinput>echo "am_cv_func_working_getline=yes" >> config.cache</userinput></screen> - <para>Prepare Findutils for compilation:</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../../final-system/common/findutils.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'a'])"/> <screen><userinput>./configure --prefix=/tools \ --host=${LFS_TARGET} --cache-file=config.cache</userinput></screen> - <para>Compile the package:</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../../final-system/common/findutils.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/> -<screen><userinput>make</userinput></screen> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../../final-system/common/findutils.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'d'])"/> - <para>Install the package:</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../../final-system/common/findutils.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'f'])"/> -<screen><userinput>make install</userinput></screen> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../../final-system/common/findutils.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'g'])"/> </sect2> Modified: branches/cross-lfs/BOOK/temp-system/multilib/findutils.xml =================================================================== --- branches/cross-lfs/BOOK/temp-system/multilib/findutils.xml 2005-08-17 18:31:15 UTC (rev 6698) +++ branches/cross-lfs/BOOK/temp-system/multilib/findutils.xml 2005-08-17 19:40:45 UTC (rev 6699) @@ -45,24 +45,34 @@ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../common/findutils.xml" - xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[1])"/> + xpointer="xpointer(//[EMAIL PROTECTED]'aa'])"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../common/findutils.xml" - xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[1])"/> + xpointer="xpointer(//[EMAIL PROTECTED]'ab'])"/> - <para>Prepare Findutils for compilation:</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/findutils.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'a'])"/> <screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \ --host=${LFS_TARGET} --cache-file=config.cache</userinput></screen> - <para>Compile the package:</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/findutils.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/> -<screen><userinput>make</userinput></screen> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/findutils.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'d'])"/> - <para>Install the package:</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/findutils.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'f'])"/> -<screen><userinput>make install</userinput></screen> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../common/findutils.xml" + xpointer="xpointer(//[EMAIL PROTECTED]'g'])"/> </sect2> -- http://linuxfromscratch.org/mailman/listinfo/lfs-book FAQ: http://www.linuxfromscratch.org/lfs/faq.html Unsubscribe: See the above information page