gdal-pluginsdir.patch

   1 --- gdal-1.11.2/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp.orig   2015-02-10 13:11:16.000000000 +0100
   2 +++ gdal-1.11.2/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp        2015-03-01 21:09:07.960962291 +0100
   3 @@ -815,12 +815,12 @@
   4      }
   5      else
   6      {
   7 -#ifdef GDAL_PREFIX
   8 +#if 1
   9          papszSearchPath = CSLAddString( papszSearchPath,
  10      #ifdef MACOSX_FRAMEWORK
  11                                          GDAL_PREFIX "/PlugIns");
  12      #else
  13 -                                        GDAL_PREFIX "/lib/gdalplugins" );
  14 +                                        GDAL_LIBDIR "/gdalplugins" );
  15      #endif
  16  #else
  17          char szExecPath[1024];
  18 --- gdal-1.11.2/gcore/gdaldrivermanager.cpp.orig        2015-02-10 13:12:08.000000000 +0100
  19 +++ gdal-1.11.2/gcore/gdaldrivermanager.cpp     2015-03-01 21:11:24.537623226 +0100
  20 @@ -686,12 +686,12 @@
  21      }
  22      else
  23      {
  24 -#ifdef GDAL_PREFIX
  25 +#if 1
  26          papszSearchPath = CSLAddString( papszSearchPath,
  27      #ifdef MACOSX_FRAMEWORK
  28                                          GDAL_PREFIX "/PlugIns");
  29      #else
  30 -                                        GDAL_PREFIX "/lib/gdalplugins" );
  31 +                                        GDAL_LIBDIR "/gdalplugins" );
  32      #endif
  33  #else
  34          char szExecPath[1024];
  35 --- gdal-1.11.2/configure.in.orig       2015-03-01 09:07:33.069445871 +0100
  36 +++ gdal-1.11.2/configure.in    2015-03-01 21:13:55.727616880 +0100
  37 @@ -3812,12 +3812,16 @@
  38
  39  if test "$prefix" = "NONE" ; then
  40    GDAL_PREFIX=/usr/local
  41 +  GDAL_LIBDIR=${GDAL_PREFIX}/lib
  42  else
  43    GDAL_PREFIX=${prefix}
  44 +  eval eval GDAL_LIBDIR="${libdir}"
  45  fi
  46
  47  export GDAL_PREFIX
  48 +export GDAL_LIBDIR
  49  AC_DEFINE_UNQUOTED(GDAL_PREFIX,["]$GDAL_PREFIX["], [--prefix directory for GDAL install])
  50 +AC_DEFINE_UNQUOTED(GDAL_LIBDIR,["]$GDAL_LIBDIR["], [--prefix directory for GDAL install])
  51
  52  dnl ---------------------------------------------------------------------------
  53  dnl Perl bindings.