2 files changed, 3 insertions, 4 deletions
diff --git a/setup/win32/Makefile b/setup/win32/Makefile
index 3644d7fe0db..94c5facadb0 100644
--- a/setup/win32/Makefile
+++ b/setup/win32/Makefile
@@ -5,10 +5,10 @@ include Makefile.servicename
 SERVER_DIRECTORY=../..
 FILES_DIRECTORY=release
 
-MAKENSIS_ARGUMENTS=/DVERSION=$(VERSION) /DSERVICENAME=${SERVICENAME}
+MAKENSIS_ARGUMENTS=/DVERSION=$(VERSION) /DSERVICENAME=${SERVICENAME} /DPYTHONVERSION=${PYTHON_VERSION}
 
 LAUNCH_MAKENSIS=/cygdrive/c/tools/cygwin/makensis $(MAKENSIS_ARGUMENTS) setup.nsi
-WINPY_DIR=/cygdrive/c/odoobuild/WinPython/python-3.6.2
+WINPY_DIR=/cygdrive/c/odoobuild/WinPython/python-${PYTHON_VERSION}
 
 default: allinone
 
diff --git a/setup/win32/setup.nsi b/setup/win32/setup.nsi
index a2095e98833..04da25eaf6b 100755
--- a/setup/win32/setup.nsi
+++ b/setup/win32/setup.nsi
@@ -208,7 +208,7 @@ Section $(TITLE_OpenERP_Server) SectionOpenERP_Server
     
     # Installing winpython
     SetOutPath "$INSTDIR\python"
-    File /r /x "__pycache__" "..\..\..\WinPython\python-3.6.2\*"
+    File /r /x "__pycache__" "..\..\..\WinPython\python-${PYTHONVERSION}\*"
 
     SetOutPath "$INSTDIR\nssm"
     File /r /x "src" "..\..\..\nssm-2.24\*"
@@ -229,7 +229,6 @@ Section $(TITLE_OpenERP_Server) SectionOpenERP_Server
 
     SetOutPath "$INSTDIR\thirdparty"
     File /r "${STATIC_PATH}\wkhtmltopdf\*"
-    File /r "${STATIC_PATH}\less\*"
 
 # If there is a previous install of the OpenERP Server, keep the login/password from the config file
     WriteIniStr "$INSTDIR\server\odoo.conf" "options" "db_host" $TextPostgreSQLHostname