1 diff -urNp -x '*.orig' gdal-3.0.4.org/configure.ac gdal-3.0.4/configure.ac
2 --- gdal-3.0.4.org/configure.ac 2021-04-02 16:52:15.663388370 +0200
3 +++ gdal-3.0.4/configure.ac 2021-04-02 16:52:16.026721386 +0200
4 @@ -5219,12 +5219,16 @@ dnl ------------------------------------
6 if test "$prefix" = "NONE" ; then
8 + GDAL_LIBDIR=${GDAL_PREFIX}/lib
11 + eval eval GDAL_LIBDIR="${libdir}"
16 AC_DEFINE_UNQUOTED(GDAL_PREFIX,["]$GDAL_PREFIX["], [--prefix directory for GDAL install])
17 +AC_DEFINE_UNQUOTED(GDAL_LIBDIR,["]$GDAL_LIBDIR["], [--prefix directory for GDAL install])
19 dnl ---------------------------------------------------------------------------
21 diff -urNp -x '*.orig' gdal-3.0.4.org/gcore/gdaldrivermanager.cpp gdal-3.0.4/gcore/gdaldrivermanager.cpp
22 --- gdal-3.0.4.org/gcore/gdaldrivermanager.cpp 2020-01-28 11:18:44.000000000 +0100
23 +++ gdal-3.0.4/gcore/gdaldrivermanager.cpp 2021-04-02 16:52:16.026721386 +0200
24 @@ -745,12 +745,12 @@ void GDALDriverManager::AutoLoadDrivers(
30 papszSearchPath = CSLAddString( papszSearchPath,
31 #ifdef MACOSX_FRAMEWORK
32 GDAL_PREFIX "/PlugIns");
34 - GDAL_PREFIX "/lib/gdalplugins" );
35 + GDAL_LIBDIR "/gdalplugins" );
38 char szExecPath[1024];