Default make rule:

* No longer depends on setup, as it does its own npm install.
* Runs make in src, not in tools/htdocs.
* Runs regular make in doc, not make install.

diff --git a/Makefile b/Makefile
index 322bd9e..e3dea3a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,10 @@
 # You need node.js to build MKWS. On caliban, get it using:
 # export PATH=$PATH:/home/indexdata/node/node-v0.10.32-linux-x64/bin
 
-all: setup
+all:
        ${MAKE} -C./test node-modules
-       ${MAKE} -C./tools/htdocs $@
-       ${MAKE} -C./doc install
+       ${MAKE} -C./src
+       ${MAKE} -C./doc
 
 clean distclean:
        ${MAKE} -C./tools/htdocs $@