Changeset 8ccf082a for Makefile

Timestamp:

01/31/2024 07:22:48 PM (8 months ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib, xry111/multilib

Children:

ac1639c

Parents:

f6a43f6 (diff), a4eaba6 (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

File:

• Makefile (modified) (10 diffs)

Makefile

@@ -1 +1 @@
 # vim:ts=3
-#BASEDIR = ~/lfs-book
-#SYSDDIR = ~/lfs-systemd
-#DUMPDIR = ~/lfs-commands
 RENDERTMP = $(HOME)/tmp
 CHUNK_QUIET = 1
@@ -25 +22 @@
 
 ifeq ($(REV), sysv)
-  BASEDIR         ?= ~/public_html/lfs-book
+  BASEDIR         ?= $(HOME)/public_html/lfs-book
   PDF_OUTPUT      ?= LFS-BOOK.pdf
   NOCHUNKS_OUTPUT ?= LFS-BOOK.html
-  DUMPDIR         ?= ~/lfs-commands
+  DUMPDIR         ?= $(HOME)/lfs-commands
 else
-  BASEDIR         ?= ~/public_html/lfs-systemd
+  BASEDIR         ?= $(HOME)/public_html/lfs-systemd
   PDF_OUTPUT      ?= LFS-SYSD-BOOK.pdf
   NOCHUNKS_OUTPUT ?= LFS-SYSD-BOOK.html
-  DUMPDIR         ?= ~/lfs-sysd-commands
+  DUMPDIR         ?= $(HOME)/lfs-sysd-commands
 endif
 
@@ -61 +58 @@
         $(Q)mkdir -p $(BASEDIR)/stylesheets
         $(Q)cp stylesheets/lfs-xsl/*.css $(BASEDIR)/stylesheets
-        $(Q)sed -i 's|../stylesheet|stylesheet|' $(BASEDIR)/index.html
+        $(Q)sed -e 's|../stylesheet|stylesheet|' \
+           -i $(BASEDIR)/index.html
 
         $(Q)mkdir -p $(BASEDIR)/images
@@ -69 +67 @@
         $(Q)for filename in `find $(BASEDIR) -name "*.html"`; do \
          tidy -config tidy.conf $$filename;           \
-         true;                                        \
          /bin/bash obfuscate.sh $$filename;           \
-         sed -e "s@text/html@application/xhtml+xml@g" \
+         sed -e "s|text/html|application/xhtml+xml|g" \
              -i $$filename;                           \
-   done;
+       done
 
         $(Q)$(MAKE) --no-print-directory wget-list md5sums
@@ -112 +109 @@
                 stylesheets/lfs-nochunks.xsl           \
                 $(RENDERTMP)/lfs-html.xml
-#                $(RENDERTMP)/lfs-html2.xml
 
         @echo "Running Tidy..."
-        $(Q)tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true
+        $(Q)tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || test $$? -le 1
 
         @echo "Running obfuscate.sh..."
-        $(Q)bash obfuscate.sh                                $(BASEDIR)/$(NOCHUNKS_OUTPUT)
-        $(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)bash obfuscate.sh      $(BASEDIR)/$(NOCHUNKS_OUTPUT)
+        $(Q)sed -e "s|text/html|application/xhtml+xml|g" \
+           -e "s|../wget-list|wget-list|"           \
+           -e "s|../md5sums|md5sums|"               \
+           -i $(BASEDIR)/$(NOCHUNKS_OUTPUT)
 
         @echo "Output at $(BASEDIR)/$(NOCHUNKS_OUTPUT)"
@@ -140 +137 @@
         $(Q)xsltproc --nonet                               \
                 --xinclude                            \
-                --output $(RENDERTMP)/lfs-html2.xml   \
                 --stringparam profile.revision $(REV) \
                 --stringparam profile.arch $(ARCH)    \
+                --output $(RENDERTMP)/lfs-html2.xml   \
                 stylesheets/lfs-xsl/profile.xsl       \
                 index.xml
 
         @echo "Validating the book..."
-        $(Q)xmllint --nonet                      \
-               --noent                      \
-               --postvalid                  \
-               -o $(RENDERTMP)/lfs-full.xml \
+        $(Q)xmllint --nonet                            \
+               --encode UTF-8                     \
+               --postvalid                        \
+               --output $(RENDERTMP)/lfs-full.xml \
                $(RENDERTMP)/lfs-html2.xml
 
@@ -172 +169 @@
         @echo "Generating consolidated wget list at $(BASEDIR)/wget-list ..."
         $(Q)mkdir -p $(BASEDIR)
-        $(Q)xsltproc --xinclude --nonet            \
+        $(Q)xsltproc --nonet                       \
+                --xinclude                    \
                 --output $(BASEDIR)/wget-list \
                 stylesheets/wget-list.xsl     \
@@ -178 +176 @@
 
 $(BASEDIR)/wget-list-$(REV): stylesheets/wget-list.xsl $(DOWNLOADS_DEP)
-        $(Q)xsltproc --nonet --xinclude                   \
+        $(Q)xsltproc --nonet                               \
+                --xinclude                            \
                 --stringparam profile.revision $(REV) \
                 --output $(RENDERTMP)/wget-list.xml   \
                 stylesheets/lfs-xsl/profile.xsl       \
                 chapter03/chapter03.xml
-        $(Q)xsltproc --xinclude --nonet                  \
+
+        $(Q)xsltproc --nonet                              \
                 --output $(BASEDIR)/wget-list-$(REV) \
                 stylesheets/wget-list.xsl            \
@@ -193 +193 @@
         $(Q)mkdir -p $(BASEDIR)
 
-        $(Q)xsltproc --nonet --xinclude                   \
+        $(Q)xsltproc --nonet                               \
+                --xinclude                            \
                 --stringparam profile.revision $(REV) \
                 --stringparam profile.arch $(ARCH)    \
@@ -200 +201 @@
                 chapter03/chapter03.xml
 
-        $(Q)xsltproc --xinclude --nonet         \
+        $(Q)xsltproc --nonet                     \
                 --output $(BASEDIR)/md5sums \
                 stylesheets/md5sum.xsl      \