Browse Source

Remove && after commands in new packages. It's not used with other packages.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10152 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Krejzi 12 years ago
parent
commit
099fa3db98
6 changed files with 12 additions and 11 deletions
  1. 5 3
      chapter05/gettext.xml
  2. 2 2
      chapter06/attr.xml
  3. 1 2
      chapter06/expat.xml
  4. 1 1
      chapter06/glibc.xml
  5. 1 1
      chapter06/intltool.xml
  6. 2 2
      chapter06/libcap.xml

+ 5 - 3
chapter05/gettext.xml

@@ -44,7 +44,7 @@
     <title>Installation of Gettext</title>
     <title>Installation of Gettext</title>
 
 
     <para>For our temporary set of tools, we only need to build and install
     <para>For our temporary set of tools, we only need to build and install
-    one binary from Gettext.</para>
+    three binaries from Gettext.</para>
 
 
     <para>Prepare Gettext for compilation:</para>
     <para>Prepare Gettext for compilation:</para>
 
 
@@ -76,7 +76,9 @@ EMACS="no" ./configure --prefix=/tools --disable-shared</userinput></screen>
     <para>Compile the package:</para>
     <para>Compile the package:</para>
 
 
 <screen><userinput remap="make">make -C gnulib-lib
 <screen><userinput remap="make">make -C gnulib-lib
-make -C src msgfmt</userinput></screen>
+make -C src msgfmt
+make -C src msgmerge
+make -C src xgettext</userinput></screen>
 
 
     <para>As only one binary has been compiled, it is not possible to run the
     <para>As only one binary has been compiled, it is not possible to run the
     test suite without compiling additional support libraries from the Gettext
     test suite without compiling additional support libraries from the Gettext
@@ -85,7 +87,7 @@ make -C src msgfmt</userinput></screen>
 
 
     <para>Install the <command>msgfmt</command> binary:</para>
     <para>Install the <command>msgfmt</command> binary:</para>
 
 
-<screen><userinput remap="install">cp -v src/msgfmt /tools/bin</userinput></screen>
+<screen><userinput remap="install">cp -v src/{msgfmt,msgmerge,xgettext} /tools/bin</userinput></screen>
 
 
   </sect2>
   </sect2>
 
 

+ 2 - 2
chapter06/attr.xml

@@ -62,7 +62,7 @@
 
 
     <para>Install the package:</para>
     <para>Install the package:</para>
 
 
-<screen><userinput remap="install">make install install-dev install-lib &amp;&amp;
+<screen><userinput remap="install">make install install-dev install-lib
 chmod -v 0755 /lib/libattr.so.1.1.0</userinput></screen>
 chmod -v 0755 /lib/libattr.so.1.1.0</userinput></screen>
 
 
     <para>Remove static library and libtool archive from
     <para>Remove static library and libtool archive from
@@ -74,7 +74,7 @@ chmod -v 0755 /lib/libattr.so.1.1.0</userinput></screen>
     <para>Change default location for the libtool archive and recreate
     <para>Change default location for the libtool archive and recreate
     symlink to shared library since it points to removed file:</para>
     symlink to shared library since it points to removed file:</para>
 
 
-<screen><userinput remap="install">sed -i 's@/lib@/usr/lib@' /usr/lib/libattr.la &amp;&amp;
+<screen><userinput remap="install">sed -i 's@/lib@/usr/lib@' /usr/lib/libattr.la
 ln -sfv ../../lib/libattr.so.1 /usr/lib/libattr.so</userinput></screen>
 ln -sfv ../../lib/libattr.so.1 /usr/lib/libattr.so</userinput></screen>
 
 
   </sect2>
   </sect2>

+ 1 - 2
chapter06/expat.xml

@@ -59,7 +59,7 @@
 
 
     <para>If desired, install the documentation:</para>
     <para>If desired, install the documentation:</para>
 
 
-<screen><userinput remap="install">install -v -dm755 /usr/share/doc/expat-&expat-version; &amp;&amp;
+<screen><userinput remap="install">install -v -dm755 /usr/share/doc/expat-&expat-version;
 install -v -m644 doc/*.{html,png,css} /usr/share/doc/expat-&expat-version;</userinput></screen>
 install -v -m644 doc/*.{html,png,css} /usr/share/doc/expat-&expat-version;</userinput></screen>
 
 
   </sect2>
   </sect2>
@@ -85,7 +85,6 @@ install -v -m644 doc/*.{html,png,css} /usr/share/doc/expat-&expat-version;</user
       <?dbhtml list-presentation="table"?>
       <?dbhtml list-presentation="table"?>
 
 
       <varlistentry id="xmlwf">
       <varlistentry id="xmlwf">
-         <!-- Don't remove the extra space, it prevents a FOP warning. -->
         <term><command>xmlwf </command></term>
         <term><command>xmlwf </command></term>
         <listitem>
         <listitem>
           <para>is a non-validating utility to check whether or not
           <para>is a non-validating utility to check whether or not

+ 1 - 1
chapter06/glibc.xml

@@ -176,7 +176,7 @@ cp -v ../glibc-&glibc-version;/nis/rpcsvc/*.h /usr/include/rpcsvc</userinput></s
     <para>Install the configuration file and runtime directory for
     <para>Install the configuration file and runtime directory for
     <command>nscd</command>:</para>
     <command>nscd</command>:</para>
 
 
-<screen><userinput remap="install">cp -v ../glibc-&glibc-version;/nscd/nscd.conf /etc/nscd.conf &amp;&amp;
+<screen><userinput remap="install">cp -v ../glibc-&glibc-version;/nscd/nscd.conf /etc/nscd.conf
 mkdir -pv /var/cache/nscd</userinput></screen>
 mkdir -pv /var/cache/nscd</userinput></screen>
 
 
     <para>The locales that can make the system respond in a different language
     <para>The locales that can make the system respond in a different language

+ 1 - 1
chapter06/intltool.xml

@@ -55,7 +55,7 @@
 
 
     <para>Install the package:</para>
     <para>Install the package:</para>
 
 
-<screen><userinput remap="install">make install &amp;&amp;
+<screen><userinput remap="install">make install
 install -v -m644 -D doc/I18N-HOWTO \
 install -v -m644 -D doc/I18N-HOWTO \
   /usr/share/doc/intltool-&intltool-version;/I18N-HOWTO</userinput></screen>
   /usr/share/doc/intltool-&intltool-version;/I18N-HOWTO</userinput></screen>
 
 

+ 2 - 2
chapter06/libcap.xml

@@ -51,7 +51,7 @@
 
 
     <para>Install the package:</para>
     <para>Install the package:</para>
 
 
-<screen><userinput remap="install">make RAISE_SETFCAP=no prefix=/usr install &amp;&amp;
+<screen><userinput remap="install">make RAISE_SETFCAP=no prefix=/usr install
 chmod -v 0755 /usr/lib/libcap.so.2.22</userinput></screen>
 chmod -v 0755 /usr/lib/libcap.so.2.22</userinput></screen>
 
 
     <para>The shared library needs to be moved to
     <para>The shared library needs to be moved to
@@ -59,7 +59,7 @@ chmod -v 0755 /usr/lib/libcap.so.2.22</userinput></screen>
     <filename class="extension">.so</filename> file in
     <filename class="extension">.so</filename> file in
     <filename class="directory">/usr/lib</filename> will need to be recreated:</para>
     <filename class="directory">/usr/lib</filename> will need to be recreated:</para>
 
 
-<screen><userinput remap="install">mv -v /usr/lib/libcap.so.* /lib &amp;&amp;
+<screen><userinput remap="install">mv -v /usr/lib/libcap.so.* /lib
 ln -sfv ../../lib/libcap.so.2 /usr/lib/libcap.so</userinput></screen>
 ln -sfv ../../lib/libcap.so.2 /usr/lib/libcap.so</userinput></screen>
 
 
   </sect2>
   </sect2>