Changeset 536b6aa for Makefile

Timestamp:

08/10/2004 07:20:54 PM (20 years ago)

Author:

Gerard Beekmans <gerard@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 6.1, 6.1.1, 6.3, 6.4, 6.5, 6.6, 6.7, 6.8, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

01d6d63

Parents:

3f82d65

Message:

Synced Makefile file from testing branch. Added index-print.xml from testing branch so PDF generation works properly for trunk too

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@4022 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

File:

• Makefile (modified) (1 diff)

Makefile

@@ -28 +28 @@
         sh goTidy $(BASEDIR)/
 
+#
+# This is the old "pdf" target. The old "print" target below has been
+# renamed to "pdf" and will be used. This commented out previous_pdf
+# target can be removed eventually. It'll remain here for a bit for
+# historical reasons
+#
+#previous_pdf:
+#       xsltproc --xinclude --nonet --output $(BASEDIR)/lfs.fo stylesheets/lfs-pdf.xsl \
+#         index.xml
+#       sed -i -e "s/inherit/all/" $(BASEDIR)/lfs.fo
+#       fop.sh $(BASEDIR)/lfs.fo $(BASEDIR)/$(PDF_OUTPUT)
+#       rm lfs.fo
+
 pdf:
-        xsltproc --xinclude --nonet --output lfs.fo stylesheets/lfs-pdf.xsl \
-          index.xml
-        sed -i -e "s/inherit/all/" lfs.fo
-        fop.sh lfs.fo $(PDF_OUTPUT)
-
-print:
-        xsltproc --xinclude --nonet --stringparam profile.condition print --output lfs-print.xml \
-          stylesheets/lfs-profile.xsl index.xml
-        xsltproc --nonet --output lfs-print.fo stylesheets/lfs-print.xsl lfs-print.xml
-        sed -i -e "s/inherit/all/" lfs-print.fo
-        fop.sh lfs-print.fo $(PRINT_OUTPUT)
+        xsltproc --xinclude --nonet --stringparam profile.condition print \
+                --output $(BASEDIR)/lfs-print.xml stylesheets/lfs-profile.xsl index-print.xml
+        xsltproc --nonet --output $(BASEDIR)/lfs-print.fo stylesheets/lfs-print.xsl \
+                $(BASEDIR)/lfs-print.xml
+        sed -i -e "s/inherit/all/" $(BASEDIR)/lfs-print.fo
+        fop.sh $(BASEDIR)/lfs-print.fo $(BASEDIR)/$(PRINT_OUTPUT)
+        rm $(BASEDIR)/lfs-print.xml $(BASEDIR)/lfs-print.fo
 
 nochunks:
-        xsltproc --xinclude --nonet --output $(NOCHUNKS_OUTPUT) \
+        xsltproc --xinclude --nonet --output $(BASEDIR)/$(NOCHUNKS_OUTPUT) \
           stylesheets/lfs-nochunks.xsl index.xml
-        tidy -config tidy.conf $(NOCHUNKS_OUTPUT) || true
+        tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true
 
 validate:
         xmllint --noout --nonet --xinclude --postvalid index.xml
+