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

no cd necessary

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@1725 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Gerard Beekmans 23 жил өмнө
parent
commit
f88a4aebfb

+ 6 - 8
chapter05/gawk-inst.xml

@@ -7,11 +7,10 @@ following commands can be used in this case.  Note that these commands
 can also be used for other glibc versions so if you aren't sure, then
 can also be used for other glibc versions so if you aren't sure, then
 use the first version.</para>
 use the first version.</para>
 
 
-<para><screen><userinput>cd awklib &amp;&amp;
-cp Makefile.in Makefile.in.backup &amp;&amp;
+<para><screen><userinput>cp awklib/Makefile.in awklib/Makefile.in.backup &amp;&amp;
 sed -e '/^datadir/s/awk/gawk/' \
 sed -e '/^datadir/s/awk/gawk/' \
--e '/^libexecdir/s%/awk%%' Makefile.in.backup &gt; Makefile.in &amp;&amp;
-cd .. &amp;&amp;
+-e '/^libexecdir/s%/awk%%' awklib/Makefile.in.backup \
+&nbsp;&nbsp;&nbsp;&gt; awklib/Makefile.in &amp;&amp;
 export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;
 export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;
 ./configure --prefix=$LFS/usr --disable-nls \
 ./configure --prefix=$LFS/usr --disable-nls \
 &nbsp;&nbsp;&nbsp;--libexecdir=$LFS/usr/bin &amp;&amp;
 &nbsp;&nbsp;&nbsp;--libexecdir=$LFS/usr/bin &amp;&amp;
@@ -22,11 +21,10 @@ make install</userinput></screen></para>
 <para>If you are using a newer glibc version (2.2.x), you can use the
 <para>If you are using a newer glibc version (2.2.x), you can use the
 following commands to install Gawk:</para>
 following commands to install Gawk:</para>
 
 
-<para><screen><userinput>cd awklib &amp;&amp;
-cp Makefile.in Makefile.in.backup &amp;&amp;
+<para><screen><userinput>cp awklib/Makefile.in awklib/Makefile.in.backup &amp;&amp;
 sed -e '/^datadir/s/awk/gawk/' \
 sed -e '/^datadir/s/awk/gawk/' \
--e '/^libexecdir/s%/awk%%' Makefile.in.backup &gt; Makefile.in &amp;&amp;
-cd .. &amp;&amp;
+-e '/^libexecdir/s%/awk%%' awklib/Makefile.in.backup \
+&nbsp;&nbsp;&nbsp;&gt; awklib/Makefile.in &amp;&amp;
 ./configure --prefix=$LFS/usr --disable-nls \
 ./configure --prefix=$LFS/usr --disable-nls \
 &nbsp;&nbsp;&nbsp;--libexecdir=$LFS/usr/bin &amp;&amp;
 &nbsp;&nbsp;&nbsp;--libexecdir=$LFS/usr/bin &amp;&amp;
 make LDFLAGS=-static &amp;&amp;
 make LDFLAGS=-static &amp;&amp;

+ 3 - 4
chapter06/gawk-inst.xml

@@ -3,11 +3,10 @@
 
 
 <para>Install Gawk by running the following commands:</para>
 <para>Install Gawk by running the following commands:</para>
 
 
-<para><screen><userinput>cd awklib &amp;&amp;
-cp Makefile.in Makefile.in.backup &amp;&amp;
+<para><screen><userinput>cp awklib/Makefile.in awklib/Makefile.in.backup &amp;&amp;
 sed -e '/^datadir/s/awk/gawk/' \
 sed -e '/^datadir/s/awk/gawk/' \
--e '/^libexecdir/s%/awk%%' Makefile.in.backup &gt; Makefile.in &amp;&amp;
-cd .. &amp;&amp;
+-e '/^libexecdir/s%/awk%%' awklib/Makefile.in.backup \
+&nbsp;&nbsp;&nbsp;&gt; awklib/Makefile.in &amp;&amp;
 ./configure --prefix=/usr --libexecdir=/usr/bin &amp;&amp;
 ./configure --prefix=/usr --libexecdir=/usr/bin &amp;&amp;
 make &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
 make install</userinput></screen></para>