organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-08 06:53:45 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-1675 have configure define a icudatadir that is used correctly

Browse source 
in the build as well as in the manual pages.

X-SVN-Rev: 7537
This commit is contained in:
Yves Arrouye 2002-01-31 01:02:36 +00:00
parent 48565dc393
commit 40ac5aa3b0
12 changed files with 223 additions and 193 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

359
icu4c/source/configure vendored
View file

File diff suppressed because it is too large Load diff

28
icu4c/source/configure.in
View file

@ -4,7 +4,7 @@ dnl Copyright (c) 1999-2000, International Business Machines Corporation and
dnl others. All Rights Reserved.
dnl Stephen F. Booth, heavily modified by Yves and others
dnl $Id: configure.in,v 1.149 2002/01/24 18:11:50 yves-oss Exp $
dnl $Id: configure.in,v 1.150 2002/01/31 01:02:35 yves-oss Exp $
dnl Process this file with autoconf to produce a configure script
AC_INIT(common/unicode/utypes.h)
@ -42,12 +42,6 @@ AC_MSG_RESULT([release $VERSION, library $LIB_VERSION])
UNICODE_VERSION="3.1.1"
AC_SUBST(UNICODE_VERSION)
thedatadir=`eval echo $datadir`
AC_SUBST(thedatadir)
thelibdir=`test "x$exec_prefix" = xNONE && exec_prefix="$prefix"; eval echo $libdir`
AC_SUBST(thelibdir)
dnl Shouldn't need the AC_SUBST
CPPFLAGS="${CPPFLAGS} -I."
AC_SUBST(CPPFLAGS)
@ -687,6 +681,26 @@ AC_ARG_WITH(data-packaging,
esac],
[datapackaging=])
thesysconfdir=`eval echo $sysconfdir`
AC_SUBST(thesysconfdir)
thedatadir=`eval echo $datadir`
AC_SUBST(thedatadir)
thelibdir=`test "x$exec_prefix" = xNONE && exec_prefix="$prefix"; eval echo $libdir`
AC_SUBST(thelibdir)
case $datapackaging in
common)
icudatadir=$datadir
theicudatadir=$thedatadir
;;
*)
icudatadir=$libdir
theicudatadir=$thelibdir
;;
esac
AC_SUBST(icudatadir)
AC_SUBST(theicudatadir)
dnl Shouldn't need the AC_SUBST
dnl Deprecated support for --enable-mapped
AC_ARG_ENABLE(mapped,,

5
icu4c/source/icudefs.mk.in
View file

@ -40,6 +40,8 @@ SO_TARGET_VERSION_MAJOR = @LIB_VERSION_MAJOR@
# to change the build this way). When building in common mode, the data
# name is the versioned platform-dependent one.
ICUDATA_DIR = @icudatadir@
ICUDATA_BASENAME_VERSION = icudt@LIB_VERSION_MAJOR@
ICUDATA_PLATFORM_NAME = $(ICUDATA_BASENAME_VERSION)@ICUDATA_CHAR@
ICUDATA_NAME = icudata
@ -48,14 +50,11 @@ PKGDATA_MODE=@DATA_PACKAGING_MODE@
endif
ifeq ($(PKGDATA_MODE),common)
ICUDATA_NAME = $(ICUDATA_PLATFORM_NAME)
ICUDATA_DIR = $(pkgdatadir)
ICUPKGDATA_DIR = $(ICUDATA_DIR)
else
ifeq ($(PKGDATA_MODE),dll)
ICUDATA_DIR = $(pkglibdir)
ICUPKGDATA_DIR = $(libdir)
else
ICUDATA_DIR = $(pkglibdir)
ICUPKGDATA_DIR = $(ICUDATA_DIR)
endif
endif

2
icu4c/source/tools/gencmn/gencmn.8.in
View file

@ -115,7 +115,7 @@ option).
.TP 10
.B ICU_DATA
Specifies the directory containing ICU data. Defaults to
.BR @thedatadir@/icu/@VERSION@/ .
.BR @theicudatadir@/icu/@VERSION@/ .
Some tools in ICU depend on the presence of the trailing slash. It is thus
important to make sure that it is present if
.B ICU_DATA

8
icu4c/source/tools/gencnval/gencnval.8.in
View file

@ -65,19 +65,19 @@ The default destination directory is specified by the environment variable
.TP 10
.B ICU_DATA
Specifies the directory containing ICU data. Defaults to
.BR @thedatadir@/icu/@VERSION@/ .
.BR @theicudatadir@/icu/@VERSION@/ .
Some tools in ICU depend on the presence of the trailing slash. It is thus
important to make sure that it is present if
.B ICU_DATA
is set.
.SH FILES
.TP \w'\fB@sysconfdir@/icu/convrtrs.txt'u+3n
.B @sysconfdir@/icu/convrtrs.txt
.TP \w'\fB@thesysconfdir@/icu/convrtrs.txt'u+3n
.B @thesysconfdir@/icu/convrtrs.txt
Description of ICU's converters and their aliases.
.SH VERSION
@VERSION@
.SH COPYRIGHT
Copyright (C) 2000 IBM, Inc. and others.
Copyright (C) 2000-2002 IBM, Inc. and others.
.SH SEE ALSO
.BR convrtrs.txt (5)
.br

2
icu4c/source/tools/gennames/gennames.8.in
View file

@ -72,7 +72,7 @@ those code points whose names were changed for Unicode 2.0.
.TP 10
.B ICU_DATA
Specifies the directory containing ICU data. Defaults to
.BR @thedatadir@/icu/@VERSION@/ .
.BR @theicudatadir@/icu/@VERSION@/ .
Some tools in ICU depend on the presence of the trailing slash. It is thus
important to make sure that it is present if
.B ICU_DATA

2
icu4c/source/tools/gennorm/gennorm.8.in
View file

@ -87,7 +87,7 @@ The default destination directory is specified by the environment variable
.TP 10
.B ICU_DATA
Specifies the directory containing ICU data. Defaults to
.BR @thedatadir@/icu/@VERSION@/ .
.BR @theicudatadir@/icu/@VERSION@/ .
Some tools in ICU depend on the presence of the trailing slash. It is thus
important to make sure that it is present if
.B ICU_DATA

2
icu4c/source/tools/genprops/genprops.8.in
View file

@ -87,7 +87,7 @@ The default destination directory is specified by the environment variable
.TP 10
.B ICU_DATA
Specifies the directory containing ICU data. Defaults to
.BR @thedatadir@/icu/@VERSION@/ .
.BR @theicudatadir@/icu/@VERSION@/ .
Some tools in ICU depend on the presence of the trailing slash. It is thus
important to make sure that it is present if
.B ICU_DATA

2
icu4c/source/tools/genrb/genrb.8.in
View file

@ -112,7 +112,7 @@ This is the set which is guaranteed to be available regardless of code page.
.TP 10
.B ICU_DATA
Specifies the directory containing ICU data. Defaults to
.BR @thedatadir@/icu/@VERSION@/ .
.BR @theicudatadir@/icu/@VERSION@/ .
Some tools in ICU depend on the presence of the trailing slash. It is thus
important to make sure that it is present if
.B ICU_DATA

2
icu4c/source/tools/gentz/gentz.8.in
View file

@ -53,7 +53,7 @@ The default destination directory is specified by the environment variable
.TP 10
.B ICU_DATA
Specifies the directory containing ICU data. Defaults to
.BR @thedatadir@/icu/@VERSION@/ .
.BR @theicudatadir@/icu/@VERSION@/ .
Some tools in ICU depend on the presence of the trailing slash. It is thus
important to make sure that it is present if
.B ICU_DATA

2
icu4c/source/tools/genuca/genuca.8.in
View file

@ -77,7 +77,7 @@ The default destination directory is specified by the environment variable
.TP 10
.B ICU_DATA
Specifies the directory containing ICU data. Defaults to
.BR @thedatadir@/icu/@VERSION@/ .
.BR @theicudatadir@/icu/@VERSION@/ .
Some tools in ICU depend on the presence of the trailing slash. It is thus
important to make sure that it is present if
.B ICU_DATA

2
icu4c/source/tools/makeconv/makeconv.8.in
View file

@ -84,7 +84,7 @@ packaged one.
.TP 10
.B ICU_DATA
Specifies the directory containing ICU data. Defaults to
.BR @thedatadir@/icu/@VERSION@/ .
.BR @theicudatadir@/icu/@VERSION@/ .
Some tools in ICU depend on the presence of the trailing slash. It is thus
important to make sure that it is present if
.B ICU_DATA