From a2b1d6bb4e4e63ced40424b112b1a49fe628afee Mon Sep 17 00:00:00 2001
From: Paul Schneider <paulschneider@free.fr>
Date: Mon, 27 Oct 2014 16:24:57 +0100
Subject: [PATCH] * Makefile: fixed the deployment against the CONFIG Makefile
 variable

* Web.csproj: missing files at deployment
---
 Makefile       | 12 ++++++------
 web/Web.csproj |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 72969a00..d67d464c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 
 
 CONFIG=Release
-DESTDIR=../build/web/$(CONFIG)
-COPYUNCHANGED=false
+DESTDIR=build/web/$(CONFIG)
+COPYUNCHANGED="false"
 
 all: build deploy
 	
@@ -10,7 +10,7 @@ ddir:
 	mkdir -p $(DESTDIR)
 
 deploy: ddir build
-	xbuild /p:Configuration=$(CONFIG) /p:SkipCopyUnchangedFiles=$(COPYUNCHANGED) /p:DeployDir=$(DESTDIR) /t:Deploy web/Web.csproj
+	xbuild /p:Configuration=$(CONFIG) /p:SkipCopyUnchangedFiles=$(COPYUNCHANGED) /p:DeployDir=../$(DESTDIR) /t:Deploy web/Web.csproj
 	rm -rf $(DESTDIR)/obj
 
 rsync: rsync-preprod rsync-local
@@ -22,11 +22,11 @@ clean:
 	xbuild /t:Clean
 	rm -rf $(DESTDIR)
 
-rsync-preprod:
-	rsync -ravu build/web/ root@lavieille.localdomain:/srv/httpd/luapre
+rsync-preprod: deploy
+	rsync -ravu build/web/$(CONFIG)/ root@lavieille.localdomain:/srv/httpd/luapre
 
 rsync-local:
-	rsync -ravu build/web/ root@localhost:/srv/www/yavsc
+	rsync -ravu build/web/$(CONFIG)/ root@localhost:/srv/www/yavsc
 
 sourcepkg:
 	git archive --format=tar --prefix=yavsc-1.1/ 1.1 | bzip2 > yavsc-1.1.tar.bz2
diff --git a/web/Web.csproj b/web/Web.csproj
index 1ce49947..e27de344 100644
--- a/web/Web.csproj
+++ b/web/Web.csproj
@@ -244,6 +244,9 @@
     <Content Include="images\pgsql.png" />
     <Content Include="Views\Home\ReferencedAssemblies.aspx" />
     <Content Include="js\rangyinputs-jquery-1.1.2.js" />
+    <Content Include="Catalog.xml" />
+    <Content Include="RegistrationMail.txt" />
+    <Content Include="instdbws.sql" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
@@ -262,9 +265,6 @@
     <None Include="README" />
     <None Include="uninstdb.sql" />
     <None Include="uninstdbws.sql" />
-    <None Include="instdbws.sql" />
-    <None Include="RegistrationMail.txt" />
-    <None Include="Catalog.xml" />
     <None Include="templates\Estim.tt">
       <Generator>TextTemplatingFilePreprocessor</Generator>
       <LastGenOutput>Estim.cs</LastGenOutput>