From e74bda4b72c0ce8b305105caf94a644a21b4cfcb Mon Sep 17 00:00:00 2001
From: Ricardo Lafuente <r@manufacturaindependente.org>
Date: Aug 16 2021 13:55:36 +0000
Subject: Remove docs generation from general makefile, use website/Makefile


---

diff --git a/Makefile b/Makefile
index 49fb796..582cb7f 100644
--- a/Makefile
+++ b/Makefile
@@ -46,24 +46,3 @@ clean:
 	rm -rf ipv4.csv
 	rm -rf ipv6.csv
 	rm -rf doxygen/
-
-### Docs ###
-
-SITE_DIR=`pwd`/website/
-ACTIVATE=. ${SITE_DIR}.env/bin/activate
-
-docs:
-	cp -f docs/build.md docs/credits.md docs/levels.md docs/permissions.md docs/versions.md docs/license.md ${SITE_DIR}content/pages
-	cp -f docs/new-wrapper.md ${SITE_DIR}content/pages/developer
-	${ACTIVATE}; cd ${SITE_DIR} && python extract_comments.py && make html
-
-serve-docs:
-	cd ${SITE_DIR} && make devserver
-
-deploy-docs: docs
-	rsync -e "ssh -p 22" -P -rvzc ${SITE_DIR}/output/ manufactura@opal5.opalstack.com:~/apps/js-shield/ --cvs-exclude
-
-dry-deploy-docs: docs
-	rsync -n -e "ssh -p 22" -P -rvzc ${SITE_DIR}/output/ manufactura@opal5.opalstack.com:~/apps/js-shield/ --cvs-exclude
-
-.PHONY: docs serve-docs deploy-docs dry-deploy-docs
diff --git a/website/Makefile b/website/Makefile
index 232f502..d3141cd 100644
--- a/website/Makefile
+++ b/website/Makefile
@@ -53,6 +53,9 @@ extract:
 	$(ACTIVATE); python extract_comments.py
 
 html:
+	cd ../docs; cp -f build.md credits.md levels.md permissions.md versions.md license.md ../website/content/pages
+	cd ../docs; cp -f new-wrapper.md ../website/content/pages/developer
+	$(ACTIVATE); python extract_comments.py
 	$(ACTIVATE); $(PELICAN) "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS)
 
 clean:
@@ -76,5 +79,10 @@ devserver-global:
 publish:
 	$(ACTIVATE); $(PELICAN) "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(PUBLISHCONF)" $(PELICANOPTS)
 
+deploy: html
+	rsync -e "ssh -p 22" -P -rvzc output/ manufactura@opal5.opalstack.com:~/apps/js-shield/ --cvs-exclude
+
+dry-deploy: html
+	rsync -n -e "ssh -p 22" -P -rvzc output/ manufactura@opal5.opalstack.com:~/apps/js-shield/ --cvs-exclude
 
 .PHONY: html help clean regenerate serve serve-global devserver publish