Changeset ada8562

Timestamp:

10/13/2014 01:24:45 AM (10 years ago)

Author:

Christopher Gregory <cjg@…>

Branches:

kde5-14686, systemd-13485

Children:

5e5b4d5

Parents:

d59bf252

Message:

Merge update from trunk.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@14591 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• postlfs/shells/zsh.xml (modified) (3 diffs)

postlfs/shells/zsh.xml

@@ -116 +116 @@
 make                                                  &&
 
+makeinfo  Doc/zsh.texi --plaintext -o Doc/zsh.txt     &&
 makeinfo  Doc/zsh.texi --html      -o Doc/html        &&
-makeinfo  Doc/zsh.texi --html --no-split --no-headers \
-                                   -o Doc/zsh.html    &&
-makeinfo  Doc/zsh.texi --plaintext -o Doc/zsh.txt</userinput></screen>
+makeinfo  Doc/zsh.texi --html --no-split --no-headers -o Doc/zsh.html</userinput></screen>
 
     <para>If you have <xref linkend="texlive"/>
@@ -131 +130 @@
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make install &amp;&amp;
-make infodir=/usr/share/info install.info
-
-install -v -m755 -d /usr/share/doc/zsh-&zsh-version;/html &amp;&amp;
-install -v -m644    Doc/html/* \
-                    /usr/share/doc/zsh-&zsh-version;/html &amp;&amp;
-install -v -m644    Doc/zsh.{html,txt} \
-                    /usr/share/doc/zsh-&zsh-version;</userinput></screen>
+<screen role="root"><userinput>make install                              &amp;&amp;
+make infodir=/usr/share/info install.info &amp;&amp;
+
+install -v -m755 -d                 /usr/share/doc/zsh-&zsh-version;/html &amp;&amp;
+install -v -m644 Doc/html/*         /usr/share/doc/zsh-&zsh-version;/html &amp;&amp;
+install -v -m644 Doc/zsh.{html,txt} /usr/share/doc/zsh-&zsh-version;</userinput></screen>
 
     <para>If you downloaded the optional documentation, install it by issuing
@@ -151 +148 @@
     <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>install -v -m644 Doc/zsh.pdf \
-        /usr/share/doc/zsh-&zsh-version;</userinput></screen>
+<screen role="root"><userinput>install -v -m644 Doc/zsh.pdf /usr/share/doc/zsh-&zsh-version;</userinput></screen>
 
   </sect2>