mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-07 22:44:49 +00:00
ICU-6214 fix datarootdir fix to work for installed users
X-SVN-Rev: 24077
This commit is contained in:
parent
65ea8e11d6
commit
e4da086056
3 changed files with 10 additions and 3 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -188,6 +188,8 @@ icu4c/source/samples/uciter8/Debug
|
|||
icu4c/source/samples/uciter8/release
|
||||
icu4c/source/samples/uciter8/uciter8.vcproj.*.*.user
|
||||
icu4c/source/samples/ucnv/Debug
|
||||
icu4c/source/samples/ucnv/convsamp
|
||||
icu4c/source/samples/ucnv/convsamp.out
|
||||
icu4c/source/samples/ucnv/release
|
||||
icu4c/source/samples/ucnv/ucnv.vcproj.*.*.user
|
||||
icu4c/source/samples/udata/Debug
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
## -*-makefile-*-
|
||||
#******************************************************************************
|
||||
# Copyright (C) 1999-2007, International Business Machines
|
||||
# Copyright (C) 1999-2008, International Business Machines
|
||||
# Corporation and others. All Rights Reserved.
|
||||
#******************************************************************************
|
||||
# This Makefile.inc is designed to be included into projects which make use
|
||||
|
@ -30,6 +30,7 @@ exec_prefix = @exec_prefix@
|
|||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
bindir = @bindir@
|
||||
datarootdir = @datarootdir@
|
||||
datadir = @datadir@
|
||||
sbindir = @sbindir@
|
||||
|
||||
|
@ -141,6 +142,10 @@ GENCMN = $(sbindir)/gencmn
|
|||
GENRB = $(bindir)/genrb
|
||||
PKGDATA = $(bindir)/pkgdata
|
||||
|
||||
# moved here because of dependencies
|
||||
pkgdatadir = $(datadir)/$(PACKAGE)$(ICULIBSUFFIX)/$(VERSION)
|
||||
pkglibdir = $(libdir)/$(PACKAGE)$(ICULIBSUFFIX)/$(VERSION)
|
||||
|
||||
##################################################################
|
||||
##################################################################
|
||||
#
|
||||
|
@ -214,8 +219,6 @@ INSTALL-L = ${INSTALL_DATA}
|
|||
#
|
||||
##################################################################
|
||||
|
||||
pkgdatadir = $(datadir)/$(PACKAGE)$(ICULIBSUFFIX)/$(VERSION)
|
||||
pkglibdir = $(libdir)/$(PACKAGE)$(ICULIBSUFFIX)/$(VERSION)
|
||||
|
||||
# The basename of the ICU data file (i.e. icudt21b )
|
||||
ICUDATA_CHAR = @ICUDATA_CHAR@
|
||||
|
|
|
@ -7,6 +7,8 @@
|
|||
|
||||
#
|
||||
# Some of these variables are overridden in the config/mh-* files.
|
||||
#
|
||||
# Please be sure to update config/Makefile.inc.in if you add something here.
|
||||
#
|
||||
|
||||
# Shell to use
|
||||
|
|
Loading…
Add table
Reference in a new issue