Changeset 4647f824

Timestamp:

01/14/2024 11:30:10 PM (5 months ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib

Children:

0632116

Parents:

e97d787 (diff), b8194e0 (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:

• Makefile (modified) (5 diffs)
• chapter08/udev.xml (modified) (1 diff)
• stylesheets/lfs-xsl/nochunks.xsl (modified) (1 diff)

Makefile

@@ +1 @@
+# vim:ts=3
 #BASEDIR = ~/lfs-book
 #SYSDDIR = ~/lfs-systemd
@@ -24 +25 @@
 
 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
@@ -61 +62 @@
         $(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
@@ -113 +115 @@
 #                $(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
@@ -121 +124 @@
         $(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)"

chapter08/udev.xml

@@ -138 +138 @@
       $(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>

stylesheets/lfs-xsl/nochunks.xsl

@@ -10 +10 @@
   <!-- 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 -->