Changeset 44758be for Makefile

Timestamp:

07/13/2004 11:09:03 AM (20 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

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:

132af6e

Parents:

21a98945

Message:

Reverted a bad change in the Makefile

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

File:

• Makefile (modified) (1 diff)

Makefile

@@ -1 @@
-BASEDIR=/home/macana/LFS/test-book-LFS/
+BASEDIR=~/lfs-book
+CHUNK_QUIET=0
+PDF_OUTPUT=LFS-BOOK.pdf
+PRINT_OUTPUT=LFS-BOOK-PRINTABLE.pdf
+NOCHUNKS_OUTPUT=LFS-BOOK.html
+XSLROOTDIR=/usr/share/xml/docbook/xsl-stylesheets-current
 
 lfs:
-        xsltproc --xinclude --nonet -stringparam base.dir $(BASEDIR) \
-          stylesheets/lfs-chunked.xsl index.xml
+        xsltproc --xinclude --nonet -stringparam chunk.quietly $(CHUNK_QUIET) \
+          -stringparam base.dir $(BASEDIR)/ stylesheets/lfs-chunked.xsl \
+          index.xml
 
-        mkdir -p $(BASEDIR)stylesheets && \
-        cp stylesheets/*.css $(BASEDIR)stylesheets
+        if [ ! -e $(BASEDIR)/stylesheets ]; then \
+          mkdir -p $(BASEDIR)/stylesheets; \
+        fi;
+        cp stylesheets/*.css $(BASEDIR)/stylesheets
 
-        mkdir -p $(BASEDIR)images && \
-        cp /usr/share/xml/docbook/xsl-stylesheets-1.65.1/images/*.png \
-        $(BASEDIR)images
-
-        cd $(BASEDIR); sed -i -e "s@../stylesheets@stylesheets@g" \
+        if [ ! -e $(BASEDIR)/images ]; then \
+          mkdir -p $(BASEDIR)/images; \
+        fi;
+        cp $(XSLROOTDIR)/images/*.png \
+          $(BASEDIR)/images
+        cd $(BASEDIR)/; sed -i -e "s@../stylesheets@stylesheets@g" \
           index.html part1.html part2.html part3.html longindex.html
-        cd $(BASEDIR); sed -i -e "s@../images@images@g" \
+        cd $(BASEDIR)/; sed -i -e "s@../images@images@g" \
           index.html part1.html part2.html part3.html longindex.html
 
-        goTidy
+        sh goTidy $(BASEDIR)/
 
 pdf:
-        xsltproc --xinclude --nonet --output $(BASEDIR)lfs.fo stylesheets/lfs-pdf.xsl \
+        xsltproc --xinclude --nonet --output lfs.fo stylesheets/lfs-pdf.xsl \
           index.xml
-        cd $(BASEDIR)
-        sed -i -e "s@inherit@all@" lfs.fo
-        JAVA_HOME=/opt/java/jre1.3.1_02 FOP_HOME=/home/macana/tmp/fop \
-  /home/macana/tmp/fop/fop.sh lfs.fo lfs.pdf
+        sed -i -e "s/inherit/all/" lfs.fo
+        fop.sh lfs.fo $(PDF_OUTPUT)
 
 print:
-        xsltproc --xinclude --nonet --output $(BASEDIR)lfs-print.fo stylesheets/lfs-print.xsl \
-          index.xml
-        cd $(BASEDIR)
-        sed -i -e "s@inherit@all@" lfs-print.fo
-        JAVA_HOME=/opt/java/jre1.3.1_02 FOP_HOME=/home/macana/tmp/fop \
-  /home/macana/tmp/fop/fop.sh lfs-print.fo lfs-print.pdf
+        xsltproc --xinclude --nonet --output lfs-print.fo \
+          stylesheets/lfs-print.xsl index.xml
+        sed -i -e "s/inherit/all/" lfs-print.fo
+        fop.sh lfs-print.fo $(PRINT_OUTPUT)
 
 nochunks:
-        xsltproc --xinclude --nonet --output $(BASEDIR)lfs-nochunk.html \
+        xsltproc --xinclude --nonet --output $(NOCHUNKS_OUTPUT) \
           stylesheets/lfs-nochunks.xsl index.xml
-        tidy -config tidy.conf $(BASEDIR)lfs-nochunk.html || true
+        tidy -config tidy.conf $(NOCHUNKS_OUTPUT) || true
 
 validate:
         xmllint --noout --nonet --xinclude --postvalid index.xml
- 
-