Changeset c093e6b for Makefile

Timestamp:

10/01/2022 10:30:12 PM (21 months ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

multilib

Children:

f3b2f16

Parents:

f29824e (diff), 4349661 (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) (5 diffs)

Makefile

@@ -27 +27 @@
   PDF_OUTPUT      ?= LFS-BOOK.pdf
   NOCHUNKS_OUTPUT ?= LFS-BOOK.html
-  DUMPDIR         ?= ~/cross-lfs-commands
+  DUMPDIR         ?= ~/lfs-commands
 else
   BASEDIR         ?= ~/lfs-systemd
@@ -151 +151 @@
                --noent                      \
                --postvalid                  \
-                    -o $(RENDERTMP)/lfs-full.xml \
+               -o $(RENDERTMP)/lfs-full.xml \
                $(RENDERTMP)/lfs-html2.xml
 
@@ -162 +162 @@
         $(Q)xsltproc --nonet                              \
                 --stringparam profile.condition html \
-                     --output $(RENDERTMP)/lfs-html.xml   \
+                --output $(RENDERTMP)/lfs-html.xml   \
                 stylesheets/lfs-xsl/profile.xsl      \
-                     $(RENDERTMP)/lfs-full.xml
+                $(RENDERTMP)/lfs-full.xml
 
 wget-list: $(BASEDIR)/wget-list $(BASEDIR)/wget-list-$(REV)
@@ -173 +173 @@
         $(Q)xsltproc --xinclude --nonet            \
                 --output $(BASEDIR)/wget-list \
-                     stylesheets/wget-list.xsl     \
+                stylesheets/wget-list.xsl     \
                 chapter03/chapter03.xml
 
@@ -213 +213 @@
         $(Q)./git-version.sh $(REV)
 
-#dump-commands: validate
-#       @echo "Dumping book commands..."
-#       $(Q)xsltproc --nonet                     \
-#      --output $(RENDERTMP)/lfs-html.xml    \
-#      --stringparam profile.revision $(REV) \
-#      stylesheets/lfs-xsl/profile.xsl       \
-#      $(RENDERTMP)/lfs-full.xml
-
-#       $(Q)rm -rf $(DUMPDIR)
-
-#       $(Q)xsltproc --output $(DUMPDIR)/          \
-#                stylesheets/dump-commands.xsl \
-#                $(RENDERTMP)/lfs-html.xml
-#       @echo "Dumping book commands complete in $(DUMPDIR)"
-
-all: book nochunks pdf # dump-commands
+dump-commands: validate
+        @echo "Dumping book commands..."
+
+        $(Q)rm -rf $(DUMPDIR)
+
+        $(Q)xsltproc --output $(DUMPDIR)/          \
+                stylesheets/dump-commands.xsl \
+                $(RENDERTMP)/lfs-full.xml
+        @echo "Dumping book commands complete in $(DUMPDIR)"
+
+all: book nochunks pdf dump-commands
 
 .PHONY : all book dump-commands nochunks pdf profile-html tmpdir validate md5sums wget-list version