Changeset ec008670 for BOOK/Makefile

Timestamp:

Jun 4, 2011, 8:30:53 AM (14 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

229ed25

Parents:

cfb2026a (diff), 622df7bc (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:

Merge branch 'master' into systemd

File:

• BOOK/Makefile (modified) (11 diffs)

BOOK/Makefile

@@ -1 @@
-TOP             := $(PWD)
+TOP             := $(shell pwd)
 RENDERDIR       := $(TOP)/../render
 
@@ -54 +54 @@
         @echo "Rendering the top-level index..."
         $(Q)xsltproc --nonet --output $(HTMLDIR)/index.html \
-          $(PWD)/stylesheets/top-index.xsl \
-          $(PWD)/index.xml
+          $(TOP)/stylesheets/top-index.xsl \
+          $(TOP)/index.xml
         @$(MAKE) --no-print-directory tidy-f TIDY_FILE=$(HTMLDIR)/index.html
 
@@ -67 +67 @@
           --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
           -o $(VALIDATEDIR)/$(arch)-full.xml \
-          $(PWD)/$(arch)-index.xml
+          $(TOP)/$(arch)-index.xml
 
 ARCHS_P_XML := $(ARCHS:%=%-profiled-xml)
@@ -78 +78 @@
         $(Q)xsltproc --nonet --stringparam profile.condition html \
           --output $(PROFILEDIR)/$(arch)-html.xml \
-          $(PWD)/stylesheets/lfs-xsl/profile.xsl \
+          $(TOP)/stylesheets/lfs-xsl/profile.xsl \
           $(VALIDATEDIR)/$(arch)-full.xml
 
@@ -93 +93 @@
           -stringparam rootid "$(ROOT_ID)" \
           -stringparam base.dir $(HTMLDIR)/$(arch)/ \
-          $(PWD)/stylesheets/clfs-chunked.xsl \
+          $(TOP)/stylesheets/clfs-chunked.xsl \
           $(PROFILEDIR)/$(arch)-html.xml
 
         @echo "Copying CSS code and images for $(arch)..."
         $(Q)mkdir -p $(HTMLDIR)/$(arch)/stylesheets
-        $(Q)cp $(PWD)/stylesheets/lfs-xsl/*.css $(HTMLDIR)/$(arch)/stylesheets
+        $(Q)cp $(TOP)/stylesheets/lfs-xsl/*.css $(HTMLDIR)/$(arch)/stylesheets
         $(Q)sed -i -e "s@../stylesheets@stylesheets@g" $(HTMLDIR)/$(arch)/*.html
         $(Q)mkdir -p $(HTMLDIR)/$(arch)/images
-        $(Q)cp $(PWD)/images/*.png $(HTMLDIR)/$(arch)/images
+        $(Q)cp $(TOP)/images/*.png $(HTMLDIR)/$(arch)/images
         $(Q)sed -i -e "s@../images@images@g" $(HTMLDIR)/$(arch)/*.html
 
@@ -117 +117 @@
         $(Q)xsltproc --nonet -stringparam rootid "$(ROOT_ID)" \
           --output $(NOCHUNKDIR)/CLFS-$(arch).html \
-          $(PWD)/stylesheets/clfs-nochunks.xsl \
+          $(TOP)/stylesheets/clfs-nochunks.xsl \
           $(PROFILEDIR)/$(arch)-html.xml
 
@@ -133 +133 @@
         $(Q)xsltproc --nonet -stringparam rootid "$(ROOT_ID)" \
           --output $(FODIR)/$(arch).fo \
-          $(PWD)/stylesheets/clfs-pdf.xsl \
+          $(TOP)/stylesheets/clfs-pdf.xsl \
           $(PROFILEDIR)/$(arch)-html.xml
         $(Q)sed -i -e 's/span="inherit"/span="all"/' $(FODIR)/$(arch).fo
@@ -156 +156 @@
         $(Q)xmllint --xinclude --noout --nonet \
           --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
-          $(PWD)/$(arch)-index.xml
+          $(TOP)/$(arch)-index.xml
 
 ARCHS_TROUBLE := $(ARCHS:%=%-trouble)
@@ -168 +168 @@
           --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
           -o $(TROUBLEDIR)/dump-$(arch) \
-          $(PWD)/$(arch)-index.xml
+          $(TOP)/$(arch)-index.xml
         $(Q)xmllint --xinclude --noout --nonet \
           --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
@@ -183 +183 @@
         $(Q)xsltproc --xinclude --nonet \
           --output $(DUMPDIR)/$(arch)/ \
-          $(PWD)/stylesheets/dump-commands.xsl \
-          $(PWD)/$(arch)-index.xml
+          $(TOP)/stylesheets/dump-commands.xsl \
+          $(TOP)/$(arch)-index.xml
 
 ARCHS_DLLIST := $(ARCHS:%=%-dllist)
@@ -195 +195 @@
         $(Q)xsltproc --xinclude --nonet \
           --output $(DLLISTDIR)/$(arch).list \
-          $(PWD)/stylesheets/wget.xsl \
-          $(PWD)/$(arch)-index.xml
+          $(TOP)/stylesheets/wget.xsl \
+          $(TOP)/$(arch)-index.xml
 
 FG_GREEN := $(shell echo -e '\e[0;32m')