From 91f37c81c3af78615c566acc7490120ed06f7bbd Mon Sep 17 00:00:00 2001
From: x2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Date: Fri, 7 Oct 2005 08:13:01 +0000
Subject: [PATCH] reorganize makefile. it will need simplifying though

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@81 839d8a87-29fc-0310-9880-83ba4fa771e5
---
 Makefile | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 2a23b2a..1570e14 100644
--- a/Makefile
+++ b/Makefile
@@ -32,9 +32,16 @@ clean:
 
 ################################################################################
 # targets
-spool/templates_c spool/uploads spool/wiki.d::
+
+spool/templates_c spool/uploads:
+	mkdir -p $@
+	chmod o+w $@
+
+spool/wiki.d:
 	mkdir -p $@
 	chmod o+w $@
+	cd $@ && ln -sf ../../install.d/wiki/wiki.d/* .
+
 
 htdocs/valid.html:
 	touch spool/templates_c/valid.html
@@ -52,11 +59,6 @@ wiki/local/farmconfig.php:
 wiki/pub/skins/empty:
 	cd wiki/pub/skins/ && ln -sf ../../../install.d/wiki/empty
 
-wiki: get-wiki build-wiki spool/uploads htdocs/uploads htdocs/wikipub
-
-spool/wiki.d::
-	cd $@ && ln -sf ../../install.d/wiki/wiki.d/* .
-
 get-wiki:
 	@if ! test -d wiki; then                                          \
 	    wget http://www.pmwiki.org/pub/pmwiki/pmwiki-latest.tgz;      \
@@ -68,6 +70,8 @@ get-wiki:
 
 build-wiki: wiki/local/farmconfig.php wiki/pub/skins/empty spool/wiki.d
 
+wiki: get-wiki build-wiki spool/uploads htdocs/uploads htdocs/wikipub
+
 ################################################################################
 
 .PHONY: build dist clean wiki build-wiki
-- 
2.1.4