Changeset 099fa3db

Timestamp:

02/15/2013 04:05:57 PM (11 years ago)

Author:

Krejzi <krejzi@…>

Branches:

7.5-systemd, 7.6-systemd, 7.7-systemd, 7.8-systemd, 7.9-systemd

Children:

24c1553

Parents:

6eb029d

Message:

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

Files:

• chapter05/gettext.xml (modified) (3 diffs)
• chapter06/attr.xml (modified) (2 diffs)
• chapter06/expat.xml (modified) (2 diffs)
• chapter06/glibc.xml (modified) (1 diff)
• chapter06/intltool.xml (modified) (1 diff)
• chapter06/libcap.xml (modified) (2 diffs)

chapter05/gettext.xml

@@ -45 +45 @@
 
     <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>
@@ -77 +77 @@
 
 <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
@@ -86 +88 @@
     <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>

chapter06/attr.xml

@@ -63 +63 @@
     <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>
 
@@ -75 +75 @@
     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>
 

chapter06/expat.xml

@@ -60 +60 @@
     <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>
 
@@ -86 +86 @@
 
       <varlistentry id="xmlwf">
-         <!-- Don't remove the extra space, it prevents a FOP warning. -->
         <term><command>xmlwf </command></term>
         <listitem>

chapter06/glibc.xml

@@ -177 +177 @@
     <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>
 

chapter06/intltool.xml

@@ -56 +56 @@
     <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 \
   /usr/share/doc/intltool-&intltool-version;/I18N-HOWTO</userinput></screen>

chapter06/libcap.xml

@@ -52 +52 @@
     <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>
 
@@ -60 +60 @@
     <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>