blob: 95c525ca1b8ea924ee3df9aee0f2d0df9c267bf0 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
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 ---------------------------------------------------------------------------
|
GitWeb
