[32166] trunk/doc-new

[jmpp at macports.org]

Revision: 32166
          http://trac.macosforge.org/projects/macports/changeset/32166
Author:   jmpp at macports.org
Date:     2007-12-18 13:55:06 -0800 (Tue, 18 Dec 2007)

Log Message:
-----------

 1. Makefile:
  * abstract all command calls into path'd variables so that the Makefile can work called off launchd without any PATH reliance;
  * in doing that, note that the xsltproc command is provided by the libxslt port and require it too (path'd under ${prefix} too, for consistency);
 2. README:
  * correct project naming case;
  * note that the libxslt port is also required to build the documentation.

Modified Paths:
--------------
    trunk/doc-new/Makefile
    trunk/doc-new/README

Modified: trunk/doc-new/Makefile
===================================================================
--- trunk/doc-new/Makefile	2007-12-18 21:51:34 UTC (rev 32165)
+++ trunk/doc-new/Makefile	2007-12-18 21:55:06 UTC (rev 32166)
@@ -1,6 +1,7 @@
 # $Id$
 # Makefile to generate the macports html guide and the man pages.
-# The ports 'docbook-xsl' and 'docbook-xml' have to be installed.
+# The ports 'docbook-xsl', 'docbook-xml' and 'libxslt' have to be
+# installed.
 
 # If your macports isn't installed in /opt/local you have to change PREFIX
 # here and update man/resources/macports.xsl to use your port installation!
@@ -9,6 +10,13 @@
 # prefix of the macports installation:
 PREFIX ?= /opt/local
 
+# command abstraction variables:
+MKDIR = /bin/mkdir
+CP = /bin/cp
+RM = /bin/rm
+SED = /usr/bin/sed
+XSLTPROC = $(PREFIX)/bin/xsltproc
+
 # data directories:
 GUIDE ?= guide
 MAN   ?= man
@@ -42,26 +50,26 @@
 all: guide man
 
 guide:
-	mkdir -p $(GUIDE-RESULT)
-	cp $(GUIDE)/resources/$(STYLESHEET) $(GUIDE-RESULT)/$(STYLESHEET)
-	cp $(GUIDE)/resources/images/* $(GUIDE-RESULT)/
-	xsltproc --xinclude $(STRINGPARAMS) --output $(GUIDE-RESULT)/index.html \
+	$(MKDIR) -p $(GUIDE-RESULT)
+	$(CP) $(GUIDE)/resources/$(STYLESHEET) $(GUIDE-RESULT)/$(STYLESHEET)
+	$(CP) $(GUIDE)/resources/images/* $(GUIDE-RESULT)/
+	$(XSLTPROC) --xinclude $(STRINGPARAMS) --output $(GUIDE-RESULT)/index.html \
 	    $(GUIDE-XSL) $(GUIDE-SRC)/guide.xml
 
 man:
-	mkdir -p $(MAN-RESULT)
-	mkdir -p $(MAN-TMP)
-	cp $(GUIDE-SRC)/portfile-*.xml $(MAN-TMP)
-	sed -i "" 's|<section|<refsection|g' $(MAN-TMP)/*
-	sed -i "" 's|</section>|</refsection>|g' $(MAN-TMP)/*
-	xsltproc --xinclude --output $(MAN-RESULT) $(MAN-XSL) \
+	$(MKDIR) -p $(MAN-RESULT)
+	$(MKDIR) -p $(MAN-TMP)
+	$(CP) $(GUIDE-SRC)/portfile-*.xml $(MAN-TMP)
+	$(SED) -i "" 's|<section|<refsection|g' $(MAN-TMP)/*
+	$(SED) -i "" 's|</section>|</refsection>|g' $(MAN-TMP)/*
+	$(XSLTPROC) --xinclude --output $(MAN-RESULT) $(MAN-XSL) \
 	    $(MAN-SRC)/port.1.xml \
 	    $(MAN-SRC)/portfile.7.xml \
 	    $(MAN-SRC)/portgroup.7.xml \
 	    $(MAN-SRC)/porthier.7.xml
-	rm -r $(MAN-TMP)
+	$(RM) -r $(MAN-TMP)
 
 clean:
-	rm -rf $(GUIDE-RESULT)
-	rm -rf $(MAN-RESULT)
-	rm -rf $(MAN-TMP)
+	$(RM) -rf $(GUIDE-RESULT)
+	$(RM) -rf $(MAN-RESULT)
+	$(RM) -rf $(MAN-TMP)

Modified: trunk/doc-new/README
===================================================================
--- trunk/doc-new/README	2007-12-18 21:51:34 UTC (rev 32165)
+++ trunk/doc-new/README	2007-12-18 21:55:06 UTC (rev 32166)
@@ -1,8 +1,9 @@
-This is the macports documentation directory.
+This is the MacPorts documentation directory.
 
 To generate it you have to checkout the whole "trunk/doc-new" directory and
-you need the "docbook-xsl" and "docbook-xml" ports. If your port installation
-isn't in /opt/local look at "Makefile" how you have to change this setup.
+you need the "docbook-xsl", "docbook-xml" and "libxslt" ports. If your port
+installation isn't in /opt/local look at "Makefile" how you have to change
+this setup.
 
 To generate the guide and the man pages just use "make" in this directory.
 Then they are generated in guide/html and man/man.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071218/bbf51a79/attachment.html