gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-07-09 22:04:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makefile: improvements in xsltproc commands

Browse Source 
- remove some useless --xinclude
- write only one option per line
- use --encode UTF-8 instead of --noent (which is useless after
  profiling anyway
- try to be consistent in option order
- use --output instead of -o
This commit is contained in:
Pierre Labastie 2024-01-27 17:03:47 +01:00
parent 16d01822df
commit b6dd23c76b
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile
View File

@ -123,16 +123,16 @@ validate: tmpdir version
@echo "Adjusting for revision $(REV)..." @echo "Adjusting for revision $(REV)..."
$(Q)xsltproc --nonet \ $(Q)xsltproc --nonet \
--xinclude \ --xinclude \
--output $(RENDERTMP)/lfs-html2.xml \
--stringparam profile.revision $(REV) \ --stringparam profile.revision $(REV) \
--output $(RENDERTMP)/lfs-html2.xml \
stylesheets/lfs-xsl/profile.xsl \ stylesheets/lfs-xsl/profile.xsl \
index.xml index.xml
@echo "Validating the book..." @echo "Validating the book..."
$(Q)xmllint --nonet \ $(Q)xmllint --nonet \
--noent \ --encode UTF-8 \
--postvalid \ --postvalid \
-o $(RENDERTMP)/lfs-full.xml \ --output $(RENDERTMP)/lfs-full.xml \
$(RENDERTMP)/lfs-html2.xml $(RENDERTMP)/lfs-html2.xml
$(Q)rm -f appendices/*.script $(Q)rm -f appendices/*.script
@ -154,18 +154,21 @@ wget-list: $(BASEDIR)/wget-list $(BASEDIR)/wget-list-$(REV)
$(BASEDIR)/wget-list: stylesheets/wget-list.xsl $(DOWNLOADS_DEP) $(BASEDIR)/wget-list: stylesheets/wget-list.xsl $(DOWNLOADS_DEP)
@echo "Generating consolidated wget list at $(BASEDIR)/wget-list ..." @echo "Generating consolidated wget list at $(BASEDIR)/wget-list ..."
$(Q)mkdir -p $(BASEDIR) $(Q)mkdir -p $(BASEDIR)
$(Q)xsltproc --xinclude --nonet \ $(Q)xsltproc --nonet \
--xinclude \
--output $(BASEDIR)/wget-list \ --output $(BASEDIR)/wget-list \
stylesheets/wget-list.xsl \ stylesheets/wget-list.xsl \
chapter03/chapter03.xml chapter03/chapter03.xml
$(BASEDIR)/wget-list-$(REV): stylesheets/wget-list.xsl $(DOWNLOADS_DEP) $(BASEDIR)/wget-list-$(REV): stylesheets/wget-list.xsl $(DOWNLOADS_DEP)
$(Q)xsltproc --nonet --xinclude \ $(Q)xsltproc --nonet \
--xinclude \
--stringparam profile.revision $(REV) \ --stringparam profile.revision $(REV) \
--output $(RENDERTMP)/wget-list.xml \ --output $(RENDERTMP)/wget-list.xml \
stylesheets/lfs-xsl/profile.xsl \ stylesheets/lfs-xsl/profile.xsl \
chapter03/chapter03.xml chapter03/chapter03.xml
$(Q)xsltproc --xinclude --nonet \
$(Q)xsltproc --nonet \
--output $(BASEDIR)/wget-list-$(REV) \ --output $(BASEDIR)/wget-list-$(REV) \
stylesheets/wget-list.xsl \ stylesheets/wget-list.xsl \
$(RENDERTMP)/wget-list.xml $(RENDERTMP)/wget-list.xml
@ -175,13 +178,14 @@ $(BASEDIR)/md5sums: stylesheets/wget-list.xsl $(DOWNLOADS_DEP)
@echo "Generating consolidated md5sum file at $(BASEDIR)/md5sums ..." @echo "Generating consolidated md5sum file at $(BASEDIR)/md5sums ..."
$(Q)mkdir -p $(BASEDIR) $(Q)mkdir -p $(BASEDIR)
$(Q)xsltproc --nonet --xinclude \ $(Q)xsltproc --nonet \
--xinclude \
--stringparam profile.revision $(REV) \ --stringparam profile.revision $(REV) \
--output $(RENDERTMP)/md5sum.xml \ --output $(RENDERTMP)/md5sum.xml \
stylesheets/lfs-xsl/profile.xsl \ stylesheets/lfs-xsl/profile.xsl \
chapter03/chapter03.xml chapter03/chapter03.xml
$(Q)xsltproc --xinclude --nonet \ $(Q)xsltproc --nonet \
--output $(BASEDIR)/md5sums \ --output $(BASEDIR)/md5sums \
stylesheets/md5sum.xsl \ stylesheets/md5sum.xsl \
$(RENDERTMP)/md5sum.xml $(RENDERTMP)/md5sum.xml