ICU-1675 hmmm, we still want things to go into wherever/icu/version

so change that and make it a new variable name for consistency.

X-SVN-Rev: 7542
This commit is contained in:
Yves Arrouye 2002-01-31 04:24:36 +00:00
parent 392baceaa3
commit 45a7e67818
12 changed files with 23 additions and 23 deletions

View file

@ -3621,12 +3621,12 @@ thelibdir=`test "x$exec_prefix" = xNONE && exec_prefix="$prefix"; eval echo $lib
case $datapackaging in
common)
icudatadir=$datadir
theicudatadir=$thedatadir
pkgicudatadir=$datadir
thepkgicudatadir=$thedatadir
;;
*)
icudatadir=$libdir
theicudatadir=$thelibdir
pkgicudatadir=$libdir
thepkgicudatadir=$thelibdir
;;
esac
@ -4053,8 +4053,8 @@ s%@LAYOUT_FALSE@%$LAYOUT_FALSE%g
s%@thesysconfdir@%$thesysconfdir%g
s%@thedatadir@%$thedatadir%g
s%@thelibdir@%$thelibdir%g
s%@icudatadir@%$icudatadir%g
s%@theicudatadir@%$theicudatadir%g
s%@pkgicudatadir@%$pkgicudatadir%g
s%@thepkgicudatadir@%$thepkgicudatadir%g
s%@DATA_PACKAGING_CPPFLAGS@%$DATA_PACKAGING_CPPFLAGS%g
s%@DATA_PACKAGING_MODE@%$DATA_PACKAGING_MODE%g
s%@ICULIBSUFFIX@%$ICULIBSUFFIX%g

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.150 2002/01/31 01:02:35 yves-oss Exp $
dnl $Id: configure.in,v 1.151 2002/01/31 04:24:35 yves-oss Exp $
dnl Process this file with autoconf to produce a configure script
AC_INIT(common/unicode/utypes.h)
@ -689,16 +689,16 @@ thelibdir=`test "x$exec_prefix" = xNONE && exec_prefix="$prefix"; eval echo $lib
AC_SUBST(thelibdir)
case $datapackaging in
common)
icudatadir=$datadir
theicudatadir=$thedatadir
pkgicudatadir=$datadir
thepkgicudatadir=$thedatadir
;;
*)
icudatadir=$libdir
theicudatadir=$thelibdir
pkgicudatadir=$libdir
thepkgicudatadir=$thelibdir
;;
esac
AC_SUBST(icudatadir)
AC_SUBST(theicudatadir)
AC_SUBST(pkgicudatadir)
AC_SUBST(thepkgicudatadir)
dnl Shouldn't need the AC_SUBST
dnl Deprecated support for --enable-mapped

View file

@ -40,7 +40,7 @@ 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_DIR = @pkgicudatadir@/$(PACKAGE)/$(VERSION)
ICUDATA_BASENAME_VERSION = icudt@LIB_VERSION_MAJOR@
ICUDATA_PLATFORM_NAME = $(ICUDATA_BASENAME_VERSION)@ICUDATA_CHAR@

View file

@ -115,7 +115,7 @@ option).
.TP 10
.B ICU_DATA
Specifies the directory containing ICU data. Defaults to
.BR @theicudatadir@/icu/@VERSION@/ .
.BR @thepkgicudatadir@/@PACKAGE@/@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

View file

@ -65,7 +65,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 @theicudatadir@/icu/@VERSION@/ .
.BR @thepkgicudatadir@/@PACKAGE@/@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

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 @theicudatadir@/icu/@VERSION@/ .
.BR @thepkgicudatadir@/@PACKAGE@/@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

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 @theicudatadir@/icu/@VERSION@/ .
.BR @thepkgicudatadir@/@PACKAGE@/@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

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 @theicudatadir@/icu/@VERSION@/ .
.BR @thepkgicudatadir@/@PACKAGE@/@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

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 @theicudatadir@/icu/@VERSION@/ .
.BR @thepkgicudatadir@/@PACKAGE@/@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

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 @theicudatadir@/icu/@VERSION@/ .
.BR @thepkgicudatadir@/@PACKAGE@/@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

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 @theicudatadir@/icu/@VERSION@/ .
.BR @thepkgicudatadir@/@PACKAGE@/@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

View file

@ -84,7 +84,7 @@ packaged one.
.TP 10
.B ICU_DATA
Specifies the directory containing ICU data. Defaults to
.BR @theicudatadir@/icu/@VERSION@/ .
.BR @thepkgicudatadir@/@PACKAGE@/@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