diff options
Diffstat (limited to 'sci-libs/gdal/files/gdal-3.0.2-datadir.patch')
-rw-r--r-- | sci-libs/gdal/files/gdal-3.0.2-datadir.patch | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/sci-libs/gdal/files/gdal-3.0.2-datadir.patch b/sci-libs/gdal/files/gdal-3.0.2-datadir.patch deleted file mode 100644 index 95c525ca1b8e..000000000000 --- a/sci-libs/gdal/files/gdal-3.0.2-datadir.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff --git a/gdal/GDALmake.opt.in b/gdal/GDALmake.opt.in -index 655c004c56..7d8f3708d6 100644 ---- a/GDALmake.opt.in -+++ b/GDALmake.opt.in -@@ -56,18 +56,23 @@ GNM_ENABLED = @GNM_ENABLED@ - OSX_FRAMEWORK_PREFIX = /Library/Frameworks/GDAL.framework - OSX_VERSION_FRAMEWORK_PREFIX = ${OSX_FRAMEWORK_PREFIX}/Versions/@GDAL_VERSION_MAJOR@.@GDAL_VERSION_MINOR@ - -+PACKAGE = @PACKAGE@ -+ - prefix = @prefix@ - exec_prefix = @exec_prefix@ -+datarootdir = @datarootdir@ -+docdir = @docdir@ -+htmldir = @htmldir@ - INST_PREFIX = @exec_prefix@ - INST_INCLUDE = @includedir@ --INST_DATA = @datadir@ -+INST_DATA = @datadir@/gdal - INST_LIB = @libdir@ - INST_BIN = @bindir@ - INST_BASH_COMPLETION = @bashcompdir@ - INST_PYMOD = @pymoddir@ --INST_DOCS = @exec_prefix@/doc -+INST_DOCS = @htmldir@ - INST_MAN = @mandir@ --INST_HTML = $(HOME)/www/gdal -+INST_WEB = $(HOME)/www/gdal - - CPPFLAGS := @CPPFLAGS@ -I$(GDAL_ROOT)/port @EXTRA_INCLUDES@ -DGDAL_COMPILATION - CFLAGS = @CFLAGS@ @C_WFLAGS@ $(USER_DEFS) -diff --git a/gdal/configure.ac b/gdal/configure.ac -index 5d0e7ab8be..afef88fdbd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -33,6 +33,7 @@ define([AC_CACHE_SAVE], ) - - dnl Process this file with autoconf to produce a configure script. - AC_INIT(GDALmake.opt.in) -+AC_SUBST(PACKAGE, gdal) - AC_CONFIG_MACRO_DIR(m4) - AC_CONFIG_HEADERS([port/cpl_config.h:port/cpl_config.h.in]) - AH_BOTTOM([#include "cpl_config_extras.h"]) -@@ -5167,25 +5168,6 @@ export BINTRUE - - AC_SUBST(BINTRUE,$BINTRUE) - --dnl --------------------------------------------------------------------------- --dnl If datadir is set to @prefix@/share, the modify it to be --dnl @prefix@/share/gdal. I wish we could default this. --dnl --------------------------------------------------------------------------- --if test "$datadir" = '${prefix}/share' ; then -- datadir='${prefix}/share/gdal' --fi -- --if test "$datadir" = '${datarootdir}' \ -- -a "$datarootdir" = '${prefix}/share' ; then -- datarootdir='${prefix}/share/gdal' --fi -- --dnl --------------------------------------------------------------------------- --dnl By default mandir is $datarootdir/man which would be --dnl /usr/local/share/gdal/man but we want man pages in /usr/local/man. --dnl --------------------------------------------------------------------------- --mandir='${prefix}/man' -- - dnl --------------------------------------------------------------------------- - dnl Capture GDAL_PREFIX for the cpl_config.h include file. - dnl --------------------------------------------------------------------------- |