r2105 - trunk

[alexander at linuxfromscratch.org]

Author: alexander
Date: 2007-10-10 09:17:39 -0600 (Wed, 10 Oct 2007)
New Revision: 2105

Modified:
   trunk/Makefile
Log:
Fixed the version string in README.html, and instructed Markfown to produce
HTML instead of XHTML (but so far, there were no empty tags in README.html).


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2007-10-10 15:14:59 UTC (rev 2104)
+++ trunk/Makefile	2007-10-10 15:17:39 UTC (rev 2105)
@@ -424,8 +424,9 @@
 	# This is not a bug.
 	@-e2fsck -f -p root.ext2
 	@( LC_ALL=C ; export LC_ALL ; \
-	    cat $(ROOT)/doc/README.html.head ; cat $(ROOT)/doc/README.txt | \
-	    $(WD)/bin/Markdown | $(WD)/bin/SmartyPants ; \
+	    cat $(ROOT)/doc/README.html.head ; \
+	    sed 's/\[version\]/$(VERSION)/' $(ROOT)/doc/README.txt | \
+		$(WD)/bin/Markdown --html4tags | $(WD)/bin/SmartyPants ; \
 	    cat $(ROOT)/doc/README.html.tail ) >$(MPBASE)/iso/README.html
 	@$(WD)/bin/mkzftree -F root.ext2 $(MPBASE)/iso/root.ext2
 	@cd $(MPBASE)/iso ; $(WD)/bin/mkisofs -z -R -l --allow-leading-dots -D -o \