diff --git a/src/qgis-ltr/osgeo4w/httpd.conf.tmpl b/src/qgis-ltr/osgeo4w/httpd.conf.tmpl index 3a6ce5f7..75917a8b 100644 --- a/src/qgis-ltr/osgeo4w/httpd.conf.tmpl +++ b/src/qgis-ltr/osgeo4w/httpd.conf.tmpl @@ -12,8 +12,8 @@ DefaultInitEnv PATH "@osgeo4w@\apps\qt5\bin;@osgeo4w@\bin;@osgeo4w@\apps\@packag DefaultInitEnv QGIS_PREFIX_PATH "@osgeo4w@\apps\@package@" DefaultInitEnv QT_PLUGIN_PATH "@osgeo4w@\apps\@package@\qtplugins;@osgeo4w@\apps\qt5\plugins" DefaultInitEnv TEMP "@temp@" -DefaultInitEnv PYTHONHOME "@osgeo4w@\apps\Python37" -DefaultInitEnv PYTHONPATH "@osgeo4w@\apps\Python37;@osgeo4w@\apps\Python37\Scripts" +DefaultInitEnv PYTHONHOME "@pythonhome@" +DefaultInitEnv PYTHONPATH "@pythonhome@;@pythonhome@\Scripts" Alias /@package@/ @osgeo4w@/apps/@package@/bin/ diff --git a/src/qgis-ltr/osgeo4w/postinstall-server.bat b/src/qgis-ltr/osgeo4w/postinstall-server.bat index 4efaba42..e30e460a 100644 --- a/src/qgis-ltr/osgeo4w/postinstall-server.bat +++ b/src/qgis-ltr/osgeo4w/postinstall-server.bat @@ -2,5 +2,6 @@ call "%OSGEO4W_ROOT%\bin\o4w_env.bat" textreplace -std ^ -map @windir@ "%WINDIR%" ^ -map @temp@ "%TEMP%" ^ + -map @pythonhome@ "%PYTHONHOME%" ^ -t httpd.d\httpd_@package@.conf del httpd.d\httpd_@package@.conf.tmpl diff --git a/src/qgis/osgeo4w/httpd.conf.tmpl b/src/qgis/osgeo4w/httpd.conf.tmpl index 3a6ce5f7..75917a8b 100644 --- a/src/qgis/osgeo4w/httpd.conf.tmpl +++ b/src/qgis/osgeo4w/httpd.conf.tmpl @@ -12,8 +12,8 @@ DefaultInitEnv PATH "@osgeo4w@\apps\qt5\bin;@osgeo4w@\bin;@osgeo4w@\apps\@packag DefaultInitEnv QGIS_PREFIX_PATH "@osgeo4w@\apps\@package@" DefaultInitEnv QT_PLUGIN_PATH "@osgeo4w@\apps\@package@\qtplugins;@osgeo4w@\apps\qt5\plugins" DefaultInitEnv TEMP "@temp@" -DefaultInitEnv PYTHONHOME "@osgeo4w@\apps\Python37" -DefaultInitEnv PYTHONPATH "@osgeo4w@\apps\Python37;@osgeo4w@\apps\Python37\Scripts" +DefaultInitEnv PYTHONHOME "@pythonhome@" +DefaultInitEnv PYTHONPATH "@pythonhome@;@pythonhome@\Scripts" Alias /@package@/ @osgeo4w@/apps/@package@/bin/ diff --git a/src/qgis/osgeo4w/postinstall-server.bat b/src/qgis/osgeo4w/postinstall-server.bat index 4efaba42..e30e460a 100644 --- a/src/qgis/osgeo4w/postinstall-server.bat +++ b/src/qgis/osgeo4w/postinstall-server.bat @@ -2,5 +2,6 @@ call "%OSGEO4W_ROOT%\bin\o4w_env.bat" textreplace -std ^ -map @windir@ "%WINDIR%" ^ -map @temp@ "%TEMP%" ^ + -map @pythonhome@ "%PYTHONHOME%" ^ -t httpd.d\httpd_@package@.conf del httpd.d\httpd_@package@.conf.tmpl