osgeo4w: use legacy packages for GDAL2 & PROJ5 also with server (foll…

…owup 5d4e77f)
qgis · Dec 24, 2019 · d21aa90 · d21aa90
1 parent 6ff46ff
commit d21aa90
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ms-windows/osgeo4w/httpd.conf.tmpl b/ms-windows/osgeo4w/httpd.conf.tmpl
@@ -8,12 +8,12 @@ DefaultInitEnv O4W_QT_TRANSLATIONS "@osgeo4w@/apps/Qt5/translations"
 DefaultInitEnv O4W_QT_HEADERS "@osgeo4w@/apps/Qt5/include"
 DefaultInitEnv O4W_QT_DOC "@osgeo4w@/apps/Qt5/doc"
 
-DefaultInitEnv PATH "@osgeo4w@\apps\qt5\bin;@osgeo4w@\bin;@osgeo4w@\apps\@package@\bin;@osgeo4w@\apps\grass\@grasspath@\bin;@osgeo4w@\apps\grass\@grasspath@\lib;@windir@\system32;@windir@;@windir@\System32\Wbem"
+DefaultInitEnv PATH "@osgeo4w@\apps\qt5\bin;@osgeo4w@\apps\gdal2\bin;@osgeo4w@\bin;@osgeo4w@\apps\@package@\bin;@osgeo4w@\apps\grass\@grasspath@\bin;@osgeo4w@\apps\grass\@grasspath@\lib;@windir@\system32;@windir@;@windir@\System32\Wbem"
 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 PYTHONPATH "@osgeo4w@\apps\gdal2\pymod3\scripts;@osgeo4w@\apps\gdal2\pymod3\lib\site-packages;@osgeo4w@\apps\Python37;@osgeo4w@\apps\Python37\Scripts"
 
 Alias /@package@/ @osgeo4w@/apps/@package@/bin/