From 7558735fc87f87a791385281fb31f4083d60199b Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Mon, 8 Jun 2020 02:34:20 +0100
Subject: [PATCH] Restoring publishing target

---
 Makefile           | 14 ++------------
 src/Yavsc/Makefile | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index db5d0562..58ec8433 100644
--- a/Makefile
+++ b/Makefile
@@ -20,20 +20,10 @@ web:
 	make -C src/Yavsc web
 
 pushInPre: yavscd
-	sudo service kestrel-pre stop
-	sudo cp yavscd /usr/local/bin/yavscd-pre
-	sudo sync
-	sudo service kestrel-pre start
+	make -C src/Yavsc pushInPre
 
 pushInProd: yavscd
-ifeq ($(git_status),0)
-	sudo service kestrel stop
-	sudo cp yavscd /usr/local/bin/yavscd
-	sudo sync
-	sudo service kestrel start
-else
-	$(error EPRODANDGITSTATUS! Refus de pousser en production: des changements doivent être validés auprès du contrôle de versions.)
-endif
+	make -C src/Yavsc pushInProd
 
 packages:
 	make -C src/Yavsc.Abstract pack
diff --git a/src/Yavsc/Makefile b/src/Yavsc/Makefile
index 4c9f4113..3b14806a 100644
--- a/src/Yavsc/Makefile
+++ b/src/Yavsc/Makefile
@@ -48,6 +48,26 @@ deploy-pkg: publish
 
 deploy: pushInPre pushInProd
 
+pushInPre: cleanoutput bin/output/wwwroot/version
+	sudo service kestrel-pre stop
+	sudo rm -rf $(DESTDIR)/approot
+	sudo cp -a bin/output/* $(DESTDIR)
+	sudo cp ../../yavscd /usr/local/bin/yavscd-pre
+	sudo sync
+	sudo service kestrel-pre start
+
+pushInProd: cleanoutput bin/output/wwwroot/version
+ifeq ($(git_status),0)
+	sudo service kestrel stop
+	sudo rm -rf $(PRODDESTDIR)/approot
+	sudo cp -a bin/output/* $(PRODDESTDIR) 
+	sudo cp ../../yavscd /usr/local/bin/yavscd
+	sudo sync
+	sudo service kestrel start
+else
+	$(error EPRODANDGITSTATUS! Refus de pousser en production: des changements doivent être validés auprès du contrôle de versions.)
+endif
+
 cleanPublish: pushInPre pushInProd 
 	rm -rf bin/output/