From: Mike Taylor <mike@indexdata.com>
Date: Thu, 12 Dec 2013 17:32:36 +0000 (+0000)
Subject: Resolve: it seems Wolfram and I both independently added an examples/htdocs/Makefile... 
X-Git-Tag: 0.9.1~76
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=aab04a5d560029b7d067c4b3a37c96d6d5d46279;p=mkws-moved-to-github.git

Resolve: it seems Wolfram and I both independently added an examples/htdocs/Makefile at the same time
---

aab04a5d560029b7d067c4b3a37c96d6d5d46279
diff --cc examples/htdocs/Makefile
index b076114,d366a41..0441bb8
--- a/examples/htdocs/Makefile
+++ b/examples/htdocs/Makefile
@@@ -1,10 -1,14 +1,20 @@@
- all: apache-config.txt
+ # Copyright (c) 2013 IndexData ApS. http://indexdata.com
+ 
 -all: jasmine-links
++all: apache-config.txt jasmine-links
 +
 +apache-config.txt: ../apache2/mkws-examples-mike
 +	rm -f $@
 +	cp -p $< $@
 +	chmod ugo-w $@
  
- clean:
 -clean distclean:
 -	rm -rf test jasmine
 -	
+ jasmine-links:
+ 	ln -fs ../../../jasmine .
+ 	ln -fs ../../test .
+ 
+ help:
+ 	@echo "make [ all | clean | jasmine-links ]"
+ 
++clean distclean:
 +	rm -f apache-config.txt
++	rm -rf test jasmine
 +