Changeset 271d1f96 for BOOK/Makefile

Timestamp:

Jun 4, 2011, 8:28:21 AM (14 years ago)

Author:

Joe Ciccone <jciccone@…>

Children:

193eb68

Parents:

0230c0a (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 simp

Conflicts:

BOOK/Makefile

File:

• BOOK/Makefile (modified) (12 diffs)

BOOK/Makefile

@@ -1 @@
-TOP             := $(PWD)
+TOP             := $(shell pwd)
 RENDERDIR       := $(TOP)/../render
 
@@ -68 +68 @@
         @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
 
@@ -81 +81 @@
           --relaxng $(TOP)/schema/clfs/0.1/rng/clfs.rng \
           -o $(VALIDATEDIR)/$(arch)-full.xml \
-          $(PWD)/$(arch)-index.xml \
+          $(TOP)/$(arch)-index.xml \
           2>&1 | grep -v " validates$$"; \
           if test $${?} -ne 0; then true; else false; fi
@@ -96 +96 @@
           --stringparam clfs.multilib "$($(arch)_ML)" \
           --output $(DBXMLDIR)/$(arch)-db.xml \
-          $(PWD)/stylesheets/clfs-profile.xsl \
+          $(TOP)/stylesheets/clfs-profile.xsl \
           $(VALIDATEDIR)/$(arch)-full.xml
 
@@ -109 +109 @@
           --stringparam profile.condition html \
           --output $(PROFILEDIR)/$(arch)-html.xml \
-          $(PWD)/stylesheets/lfs-xsl/profile.xsl \
+          $(TOP)/stylesheets/lfs-xsl/profile.xsl \
           $(DBXMLDIR)/$(arch)-db.xml
 
@@ -136 +136 @@
           -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
 
@@ -161 +161 @@
         $(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
 
@@ -178 +178 @@
         $(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
@@ -201 +201 @@
         $(Q)xmllint --xinclude --noout --nonet \
           --relaxng $(TOP)/schema/clfs/0.1/rng/clfs.rng \
-          $(PWD)/$(arch)-index.xml \
+          $(TOP)/$(arch)-index.xml \
           2>&1 | grep -v " validates$$"; \
           if test $${?} -ne 0; then true; else false; fi
@@ -215 +215 @@
           --relaxng $(TOP)/schema/clfs/0.1/rng/clfs.rng \
           -o $(TROUBLEDIR)/dump-$(arch) \
-          $(PWD)/$(arch)-index.xml \
+          $(TOP)/$(arch)-index.xml \
           2>&1 | grep -v " validates$$"; \
           if test $${?} -ne 0; then true; else false; fi
@@ -234 +234 @@
         $(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)
@@ -246 +246 @@
         $(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')