Эх сурвалжийг харах

Bug 235

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@1368 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Marc Heerdink 23 жил өмнө
parent
commit
8ac7439477

+ 5 - 0
chapter05/diffutils-exp.xml

@@ -9,5 +9,10 @@ before handing the source file to the compiler itself for compilation. This
 package has problems linking statically on systems that run an older
 Glibc version and this construction fixes that problem.</para>
 
+<para><userinput>PR_PROGRAM=/usr/bin/pr:</userinput> When 'diff' is called
+with the '-i' flag, it tries to find 'pr' at the location specified with the
+PR_PROGRAM variable. By default, this variable points to '/bin/pr', but since
+we install 'pr' in /usr/bin, we need to change this.</para>
+
 </sect2>
 

+ 2 - 2
chapter05/diffutils-inst.xml

@@ -10,14 +10,14 @@ use the first version.</para>
 <para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;
 ./configure --prefix=$LFS/usr &amp;&amp;
 unset CPPFLAGS &amp;&amp;
-make LDFLAGS=-static &amp;&amp;
+make LDFLAGS=-static PR_PROGRAM=/usr/bin/pr &amp;&amp;
 make install</userinput></screen></para>
 
 <para>If you are using a newer glibc version (2.2.x), you can use the following
 commands to install Diffutils:</para>
 
 <para><screen><userinput>./configure --prefix=$LFS/usr &amp;&amp;
-make LDFLAGS=-static &amp;&amp;
+make LDFLAGS=-static PR_PROGRAM=/usr/bin/pr &amp;&amp;
 make install</userinput></screen></para>
 
 </sect2>

+ 1 - 1
chapter06/diffutils-inst.xml

@@ -4,7 +4,7 @@
 <para>Install Diffutils by running the following commands:</para>
 
 <para><screen><userinput>./configure --prefix=/usr &amp;&amp;
-make &amp;&amp;
+make PR_PROGRAM=/usr/bin/pr &amp;&amp;
 make install</userinput></screen></para>
 
 </sect2>