aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2020-03-12 23:49:02 +0100
committerGitHub <noreply@github.com>2020-03-12 23:49:02 +0100
commit723933b52fa5e4a16e4b5c64665292afecacbba5 (patch)
tree55261e3180a1d3475b72153e100a474261b557a9
parentdc8ef32190b845b55430f85d9f9f57019555d048 (diff)
parentbbc97913a4239e64c36b18ebe6d1d171a5aca856 (diff)
downloadPROJ-723933b52fa5e4a16e4b5c64665292afecacbba5.tar.gz
PROJ-723933b52fa5e4a16e4b5c64665292afecacbba5.zip
Merge pull request #2069 from PROJ-BOT/backport-2067-to-7.0
[Backport 7.0] Autotools/pkg-conf: Define datarootdir
-rw-r--r--configure.ac3
-rw-r--r--proj.pc.in1
2 files changed, 1 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 1759624c..57a1a7b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -360,7 +360,4 @@ fi
AC_CONFIG_FILES([proj.pc])
-dnl Ignore WARNING: 'proj.pc.in' seems to ignore the --datarootdir setting
-AC_DEFUN([AC_DATAROOTDIR_CHECKED])
-
AC_OUTPUT
diff --git a/proj.pc.in b/proj.pc.in
index f66da74d..7e462138 100644
--- a/proj.pc.in
+++ b/proj.pc.in
@@ -2,6 +2,7 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
+datarootdir=@datarootdir@
datadir=@datadir@/@PACKAGE@
Name: PROJ