diff options
| author | Thomas Trepl <thomas@linuxfromscratch.org> | 2024-01-15 00:30:10 +0100 |
|---|---|---|
| committer | Thomas Trepl <thomas@linuxfromscratch.org> | 2024-01-15 00:30:10 +0100 |
| commit | 4647f824cfff190e3eb515a5626e8e9681cd08cf (patch) | |
| tree | 850a436f6b3d4050e5e62289749ad0d2e22046d7 | |
| parent | e97d7877d1c86f5b15ebec73023e8c1e57d25e78 (diff) | |
| parent | b8194e059c3255c11fe6dc057dc049f723edf56b (diff) | |
Automatic merge of trunk into multilib
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | chapter08/udev.xml | 2 | ||||
| -rw-r--r-- | stylesheets/lfs-xsl/nochunks.xsl | 3 |
3 files changed, 6 insertions, 7 deletions
@@ -1,3 +1,4 @@ +# vim:ts=3 #BASEDIR = ~/lfs-book #SYSDDIR = ~/lfs-systemd #DUMPDIR = ~/lfs-commands @@ -23,12 +24,12 @@ ifneq ($(REV), sysv) endif ifeq ($(REV), sysv) - BASEDIR ?= ~/lfs-book + BASEDIR ?= ~/public_html/lfs-book PDF_OUTPUT ?= LFS-BOOK.pdf NOCHUNKS_OUTPUT ?= LFS-BOOK.html DUMPDIR ?= ~/lfs-commands else - BASEDIR ?= ~/lfs-systemd + BASEDIR ?= ~/public_html/lfs-systemd PDF_OUTPUT ?= LFS-SYSD-BOOK.pdf NOCHUNKS_OUTPUT ?= LFS-SYSD-BOOK.html DUMPDIR ?= ~/lfs-sysd-commands @@ -60,6 +61,7 @@ book: validate profile-html $(Q)mkdir -p $(BASEDIR)/stylesheets $(Q)cp stylesheets/lfs-xsl/*.css $(BASEDIR)/stylesheets $(Q)sed -i 's|../stylesheet|stylesheet|' $(BASEDIR)/index.html + $(Q)sed -i 's/xmlns:xlink.*xlink"//' $(BASEDIR)/longindex.html $(Q)mkdir -p $(BASEDIR)/images $(Q)cp images/*.png $(BASEDIR)/images @@ -112,6 +114,7 @@ nochunks: validate profile-html $(RENDERTMP)/lfs-html.xml # $(RENDERTMP)/lfs-html2.xml + $(Q)sed 's/xmlns:xlink.*xlink"//' -i $(BASEDIR)/$(NOCHUNKS_OUTPUT) @echo "Running Tidy..." $(Q)tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true @@ -120,7 +123,6 @@ nochunks: validate profile-html $(Q)sed -i -e "s@text/html@application/xhtml+xml@g" $(BASEDIR)/$(NOCHUNKS_OUTPUT) $(Q)sed -i -e "s@../wget-list@wget-list@" $(BASEDIR)/$(NOCHUNKS_OUTPUT) $(Q)sed -i -e "s@../md5sums@md5sums@" $(BASEDIR)/$(NOCHUNKS_OUTPUT) - $(Q)sed -i -e "s@\xa9@\©@" $(BASEDIR)/$(NOCHUNKS_OUTPUT) @echo "Output at $(BASEDIR)/$(NOCHUNKS_OUTPUT)" diff --git a/chapter08/udev.xml b/chapter08/udev.xml index ec424fe50..efd312f36 100644 --- a/chapter08/udev.xml +++ b/chapter08/udev.xml @@ -137,7 +137,7 @@ meson setup \ <screen><userinput remap="make">ninja udevadm systemd-hwdb \ $(ninja -n | grep -Eo '(src/(lib)?udev|rules.d|hwdb.d)/[^ ]*') \ $(realpath libudev.so --relative-to .) \ - $udev_helpers udevadm</userinput></screen> + $udev_helpers</userinput></screen> <para>Install the package:</para> diff --git a/stylesheets/lfs-xsl/nochunks.xsl b/stylesheets/lfs-xsl/nochunks.xsl index 3ff0ebc72..351c6dbb3 100644 --- a/stylesheets/lfs-xsl/nochunks.xsl +++ b/stylesheets/lfs-xsl/nochunks.xsl @@ -10,9 +10,6 @@ <!-- Upstream XHTML templates --> <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"/> - <!-- Fix encoding issues with default UTF-8 output of the xhtml stylesheet --> - <xsl:output method="html" encoding="ISO-8859-1" indent="no" /> - <!-- Include our customized templates --> <xsl:include href="common.xsl"/> <xsl:include href="xhtml/lfs-index.xsl"/> |