Ignore:
Timestamp:
12/16/2020 05:21:20 PM (3 years ago)
Author:
Pierre Labastie <pieere@…>
Branches:
qt5new
Children:
eca919c
Parents:
6929000d (diff), f0acf55 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge trunk at r23984

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • general/genlib/libusb.xml

    r6929000d rc9f0cc0  
    77  <!ENTITY libusb-download-http "https://github.com//libusb/libusb/releases/download/v&libusb-version;/libusb-&libusb-version;.tar.bz2">
    88  <!ENTITY libusb-download-ftp  " ">
    9   <!ENTITY libusb-md5sum        "1e29700f6a134766d32b36b8d1d61a95">
    10   <!ENTITY libusb-size          "592 KB">
    11   <!ENTITY libusb-buildsize     "6.4 MB">
     9  <!ENTITY libusb-md5sum        "5bc27df16155302f308d409e73589872">
     10  <!ENTITY libusb-size          "596 KB">
     11  <!ENTITY libusb-buildsize     "5.8 MB">
    1212  <!ENTITY libusb-time          "less than 0.1 SBU">
    1313]>
     
    9797    </para>
    9898
    99 <screen><userinput>sed -i "s/^PROJECT_LOGO/#&amp;/" doc/doxygen.cfg.in &amp;&amp;
    100 
    101 ./configure --prefix=/usr --disable-static &amp;&amp;
    102 make -j1</userinput></screen>
     99<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
     100make</userinput></screen>
    103101
    104102    <para>
     
    107105    </para>
    108106
    109 <screen remap="doc"><userinput>make -C doc docs</userinput></screen>
     107<screen remap="doc"><userinput>sed -i "s/^TCL_SUBST/#&amp;/; s/wide//" doc/doxygen.cfg &amp;&amp;
     108make -C doc docs</userinput></screen>
    110109
    111110    <para>
     
    135134
    136135    <para>
    137       <command>sed -i ...</command>: This sed prevents a warning when
     136      <command>sed -i ...</command>: This sed prevents some warnings when
    138137      building the documentation.
    139138    </para>
Note: See TracChangeset for help on using the changeset viewer.