2015-04-04 21:19:52 +01:00
|
|
|
diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py
|
|
|
|
|
--- a/django/contrib/gis/gdal/libgdal.py
|
|
|
|
|
+++ b/django/contrib/gis/gdal/libgdal.py
|
|
|
|
|
@@ -17,7 +17,7 @@ try:
|
|
|
|
|
lib_path = settings.GDAL_LIBRARY_PATH
|
|
|
|
|
except (AttributeError, EnvironmentError,
|
|
|
|
|
ImportError, ImproperlyConfigured):
|
|
|
|
|
- lib_path = None
|
2017-10-09 17:14:15 +01:00
|
|
|
+ lib_path = "@gdal@/lib/libgdal@extension@"
|
2015-04-04 21:19:52 +01:00
|
|
|
|
|
|
|
|
if lib_path:
|
|
|
|
|
lib_names = None
|
|
|
|
|
diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py
|
|
|
|
|
--- a/django/contrib/gis/geos/libgeos.py
|
|
|
|
|
+++ b/django/contrib/gis/geos/libgeos.py
|
2016-08-03 08:10:38 +01:00
|
|
|
@@ -26,7 +26,7 @@ try:
|
|
|
|
|
lib_path = settings.GEOS_LIBRARY_PATH
|
|
|
|
|
except (AttributeError, EnvironmentError,
|
|
|
|
|
ImportError, ImproperlyConfigured):
|
|
|
|
|
- lib_path = None
|
2017-10-09 17:14:15 +01:00
|
|
|
+ lib_path = "@geos@/lib/libgeos_c@extension@"
|
2015-04-04 21:19:52 +01:00
|
|
|
|
2016-08-03 08:10:38 +01:00
|
|
|
# Setting the appropriate names for the GEOS-C library.
|
|
|
|
|
if lib_path:
|
