Author: krejzi
Date: Fri Feb 15 08:05:57 2013
New Revision: 10152
Log:
Remove && after commands in new packages. It's not used with other packages.
Modified:
branches/systemd/BOOK/chapter05/gettext.xml
branches/systemd/BOOK/chapter06/attr.xml
branches/systemd/BOOK/chapter06/expat.xml
branches/systemd/BOOK/chapter06/glibc.xml
branches/systemd/BOOK/chapter06/intltool.xml
branches/systemd/BOOK/chapter06/libcap.xml
Modified: branches/systemd/BOOK/chapter05/gettext.xml
==============================================================================
--- branches/systemd/BOOK/chapter05/gettext.xml Fri Feb 15 06:06:47 2013
(r10151)
+++ branches/systemd/BOOK/chapter05/gettext.xml Fri Feb 15 08:05:57 2013
(r10152)
@@ -44,7 +44,7 @@
<title>Installation of Gettext</title>
<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>
@@ -76,7 +76,9 @@
<para>Compile the package:</para>
<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
test suite without compiling additional support libraries from the Gettext
@@ -85,7 +87,7 @@
<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>
Modified: branches/systemd/BOOK/chapter06/attr.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/attr.xml Fri Feb 15 06:06:47 2013
(r10151)
+++ branches/systemd/BOOK/chapter06/attr.xml Fri Feb 15 08:05:57 2013
(r10152)
@@ -62,7 +62,7 @@
<para>Install the package:</para>
-<screen><userinput remap="install">make install install-dev install-lib
&&
+<screen><userinput remap="install">make install install-dev install-lib
chmod -v 0755 /lib/libattr.so.1.1.0</userinput></screen>
<para>Remove static library and libtool archive from
@@ -74,7 +74,7 @@
<para>Change default location for the libtool archive and recreate
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 &&
+<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>
</sect2>
Modified: branches/systemd/BOOK/chapter06/expat.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/expat.xml Fri Feb 15 06:06:47 2013
(r10151)
+++ branches/systemd/BOOK/chapter06/expat.xml Fri Feb 15 08:05:57 2013
(r10152)
@@ -59,7 +59,7 @@
<para>If desired, install the documentation:</para>
-<screen><userinput remap="install">install -v -dm755
/usr/share/doc/expat-&expat-version; &&
+<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>
</sect2>
@@ -85,7 +85,6 @@
<?dbhtml list-presentation="table"?>
<varlistentry id="xmlwf">
- <!-- Don't remove the extra space, it prevents a FOP warning. -->
<term><command>xmlwf </command></term>
<listitem>
<para>is a non-validating utility to check whether or not
Modified: branches/systemd/BOOK/chapter06/glibc.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/glibc.xml Fri Feb 15 06:06:47 2013
(r10151)
+++ branches/systemd/BOOK/chapter06/glibc.xml Fri Feb 15 08:05:57 2013
(r10152)
@@ -176,7 +176,7 @@
<para>Install the configuration file and runtime directory for
<command>nscd</command>:</para>
-<screen><userinput remap="install">cp -v
../glibc-&glibc-version;/nscd/nscd.conf /etc/nscd.conf &&
+<screen><userinput remap="install">cp -v
../glibc-&glibc-version;/nscd/nscd.conf /etc/nscd.conf
mkdir -pv /var/cache/nscd</userinput></screen>
<para>The locales that can make the system respond in a different language
Modified: branches/systemd/BOOK/chapter06/intltool.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/intltool.xml Fri Feb 15 06:06:47
2013 (r10151)
+++ branches/systemd/BOOK/chapter06/intltool.xml Fri Feb 15 08:05:57
2013 (r10152)
@@ -55,7 +55,7 @@
<para>Install the package:</para>
-<screen><userinput remap="install">make install &&
+<screen><userinput remap="install">make install
install -v -m644 -D doc/I18N-HOWTO \
/usr/share/doc/intltool-&intltool-version;/I18N-HOWTO</userinput></screen>
Modified: branches/systemd/BOOK/chapter06/libcap.xml
==============================================================================
--- branches/systemd/BOOK/chapter06/libcap.xml Fri Feb 15 06:06:47 2013
(r10151)
+++ branches/systemd/BOOK/chapter06/libcap.xml Fri Feb 15 08:05:57 2013
(r10152)
@@ -51,7 +51,7 @@
<para>Install the package:</para>
-<screen><userinput remap="install">make RAISE_SETFCAP=no prefix=/usr install
&&
+<screen><userinput remap="install">make RAISE_SETFCAP=no prefix=/usr install
chmod -v 0755 /usr/lib/libcap.so.2.22</userinput></screen>
<para>The shared library needs to be moved to
@@ -59,7 +59,7 @@
<filename class="extension">.so</filename> file in
<filename class="directory">/usr/lib</filename> will need to be
recreated:</para>
-<screen><userinput remap="install">mv -v /usr/lib/libcap.so.* /lib &&
+<screen><userinput remap="install">mv -v /usr/lib/libcap.so.* /lib
ln -sfv ../../lib/libcap.so.2 /usr/lib/libcap.so</userinput></screen>
</sect2>
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
