website d3116caa016deca49354d4351ac0356cfe52ee96

[letha...@gmail.com]

Branch: website
commit d3116caa016deca49354d4351ac0356cfe52ee96
Author: Luca Bruno <letha...@gmail.com>
Date: Mon Jan 19 23:36:26 2009 +0100

Fixed some bugs after cleanup

:100644 100644 ad1b711... 65cf3e2... M README
:100644 100644 0af98f8... ffb8a92... M wml/Makefile

diff --git a/README b/README
index ad1b711..65cf3e2 100644
--- a/README
+++ b/README
@@ -1,2 +1,3 @@
The website is written with the WML (http://thewml.org).
-Type `make' to build the HTML pages.
\ No newline at end of file
+Type `make' to build the HTML pages.
+Type `make clean' to clean the built HTML pages.
\ No newline at end of file
diff --git a/wml/Makefile b/wml/Makefile
index 0af98f8..ffb8a92 100644
--- a/wml/Makefile
+++ b/wml/Makefile
@@ -8,10 +8,12 @@ ARCHIVEDIR=$(subst .,_,$(LATEST))
ARCHIVESRCS=$(patsubst %,$(ARCHIVEDIR)/%,install.wml features.wml release-notes.wml)
ARCHIVEOBJS=$(patsubst %,$(TOPDIR)/%,$(ARCHIVESRCS:.wml=.html))

-all: $(OBJS) $(ARCHIVESRCS) $(TOPDIR)/$(ARCHIVEDIR) $(ARCHIVEOBJS)
+all: $(TOPDIR)/doc $(OBJS) $(ARCHIVESRCS) $(TOPDIR)/$(ARCHIVEDIR) $(ARCHIVEOBJS)

-$(ARCHIVEDIR)/%.wml: $(ARCHIVEDIR)
- cp -f $(subst $(ARCHIVEDIR)/,,$@) $<
+# Directories creation
+
+$(TOPDIR)/doc:
+ mkdir -p $(TOPDIR)/doc

$(ARCHIVEDIR):
mkdir -p $(ARCHIVEDIR)
@@ -19,13 +21,19 @@ $(ARCHIVEDIR):
$(TOPDIR)/$(ARCHIVEDIR):
mkdir -p $(TOPDIR)/$(ARCHIVEDIR)

+# Release archiving
+
+$(ARCHIVEDIR)/%.wml: $(ARCHIVEDIR)
+ cp -f $(subst $(ARCHIVEDIR)/,,$@) $<
+
+# HTML generation
+
$(TOPDIR)/%.html: %.wml $(INCS)
$(CC) -DLATEST=$(LATEST) -o $@ $<

$(TOPDIR)/doc/%.html: doc/%.wml $(INCS)
$(CC) -DLATEST=$(LATEST) -o $@ $<

-
$(TOPDIR)/$(ARCHIVEDIR)/%.html: $(ARCHIVEDIR)/%.wml
$(CC) -DLATEST=$(LATEST) -o $@ $<