Ignore:
Timestamp:
04/13/2021 09:31:15 PM (3 years ago)
Author:
Xi Ruoyao <xry111@…>
Branches:
kde5-14269
Parents:
1ec0251
git-author:
Krejzi <krejzi@…> (09/13/2014 05:36:06 PM)
git-committer:
Xi Ruoyao <xry111@…> (04/13/2021 09:31:15 PM)
Message:

Begin manually (while modifying stuff) merging trunk and systemd branches since revision 14087.

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • general/prog/git.xml

    r1ec0251 r64135787  
    207207    </para>
    208208
    209 <screen role="root"><userinput>tar -xf ../git-manpages-&git-version;.tar.xz -C /usr/share/man --no-same-owner --no-overwrite-dir</userinput></screen>
     209<screen role="root"><userinput>tar -xf ../git-manpages-&git-version;.tar.xz \
     210    -C /usr/share/man --no-same-owner --no-overwrite-dir</userinput></screen>
    210211
    211212    <para>
     
    214215    </para>
    215216
    216 <screen role="root"><userinput>mkdir -p /usr/share/doc/git-&git-version;/man-pages/{html,text}         &amp;&amp;
    217 
    218 tar -xf  ../git-htmldocs-&git-version;.tar.xz \
     217<screen role="root"><userinput>tar -xf  ../git-htmldocs-&git-version;.tar.xz \
    219218    -C   /usr/share/doc/git-&git-version; --no-same-owner --no-overwrite-dir &amp;&amp;
    220219
     
    230229    </para>
    231230
    232 <screen role="root"><userinput>mv       /usr/share/doc/git-&git-version;/{git*.txt,man-pages/text}     &amp;&amp;
     231<screen role="root"><userinput>mkdir -p /usr/share/doc/git-&git-version;/man-pages/{html,text}         &amp;&amp;
     232
     233mv       /usr/share/doc/git-&git-version;/{git*.txt,man-pages/text}     &amp;&amp;
    233234mv       /usr/share/doc/git-&git-version;/{git*.,index.,man-pages/}html &amp;&amp;
    234235mkdir    /usr/share/doc/git-&git-version;/technical/{html,text}         &amp;&amp;
Note: See TracChangeset for help on using the changeset viewer.