Changeset 0632116


Ignore:
Timestamp:
01/17/2024 02:07:16 PM (4 months ago)
Author:
Thomas Trepl <thomas@…>
Branches:
multilib
Children:
4a9c50a, b604503
Parents:
4647f824 (diff), 8ba840f (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:

Automatic merge of trunk into multilib

Files:
3 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    r4647f824 r0632116  
    4949endif
    5050
     51# https://github.com/docbook/xslt10-stylesheets/issues/239
     52SED_XMLNS_XLINK = sed -i 's/xmlns:xlink.*xlink"//'
     53
    5154book: validate profile-html
    5255        @echo "Generating chunked XHTML files at $(BASEDIR)/ ..."
    … …  
    6265        $(Q)cp stylesheets/lfs-xsl/*.css $(BASEDIR)/stylesheets
    6366        $(Q)sed -i 's|../stylesheet|stylesheet|' $(BASEDIR)/index.html
    64         $(Q)sed -i 's/xmlns:xlink.*xlink"//' $(BASEDIR)/longindex.html
     67        $(Q)$(SED_XMLNS_XLINK) $(BASEDIR)/longindex.html
    6568
    6669        $(Q)mkdir -p $(BASEDIR)/images
    … …  
    115118#                $(RENDERTMP)/lfs-html2.xml
    116119
    117         $(Q)sed 's/xmlns:xlink.*xlink"//' -i $(BASEDIR)/$(NOCHUNKS_OUTPUT)
     120        $(Q)$(SED_XMLNS_XLINK) $(BASEDIR)/$(NOCHUNKS_OUTPUT)
    118121        @echo "Running Tidy..."
    119122        $(Q)tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true

  • chapter08/systemd.xml

    r4647f824 r0632116  
    158158
    159159      <varlistentry>
    160         <term><parameter>-Dman=false</parameter></term>
     160        <term><parameter>-Dman=disabled</parameter></term>
    161161        <listitem>
    162162          <para>Prevent the generation of man pages to avoid extra

  • chapter08/udev.xml

    r4647f824 r0632116  
    131131
    132132    <screen><userinput remap="make">export udev_helpers=$(grep "'name' :" ../src/udev/meson.build | \
    133                awk '{print $3}' | tr -d ",'" | grep -v 'udevadm')</userinput></screen>
     133                      awk '{print $3}' | tr -d ",'" | grep -v 'udevadm')</userinput></screen>
    134134
    135135    <para>Only build the components needed for udev:</para>
Note: See TracChangeset for help on using the changeset viewer.