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

ICU-695 put data under $(libdir) not $(datadir).

Browse source 
X-SVN-Rev: 2790
This commit is contained in:
Yves Arrouye 2000-10-25 22:26:17 +00:00
parent 374c096dcb
commit 006615f65b
10 changed files with 197 additions and 173 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -26,6 +26,7 @@ icu4c/debian/icu.prerm
icu4c/debian/libicu16
icu4c/debian/tmp
icu4c/source/Makefile
icu4c/source/README
icu4c/source/common/*.ao
icu4c/source/common/*.d
icu4c/source/common/Debug

1
icu4c/source/.cvsignore
View file

@ -3,4 +3,5 @@ config.cache
config.status
Makefile
icudefs.mk
README

11
icu4c/source/Makefile.in
View file

@ -83,13 +83,14 @@ clean-recursive-with-twist:
all-local: $(srcdir)/configure $(srcdir)/icudefs.mk
install-local: $(top_builddir)/config/Makefile.inc @platform_make_fragment@ $(EXTRA_DATA:%=$(DESTDIR)$(pkglibdir)/$(VERSION)/%)
@$(MKINSTALLDIRS) $(DESTDIR)$(pkgdatadir)/config
install-local: $(top_builddir)/config/Makefile.inc @platform_make_fragment@ README $(EXTRA_DATA:%=$(DESTDIR)$(pkglibdir)/$(VERSION)/%)
@$(MKINSTALLDIRS) $(DESTDIR)$(pkgdatadir)/$(VERSION)/config
@$(MKINSTALLDIRS) $(DESTDIR)$(pkglibdir)
@$(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
$(INSTALL_DATA) $(top_builddir)/config/Makefile.inc $(DESTDIR)$(pkglibdir)/Makefile.inc
$(INSTALL_DATA) @platform_make_fragment@ $(DESTDIR)$(pkgdatadir)/config/@platform_make_fragment_name@
$(INSTALL_DATA) @platform_make_fragment@ $(DESTDIR)$(pkgdatadir)/$(VERSION)/config/@platform_make_fragment_name@
$(INSTALL_SCRIPT) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir)/mkinstalldirs
$(INSTALL_SCRIPT) README $(DESTDIR)$(pkgdatadir)/$(VERSION)/README
$(DESTDIR)$(pkglibdir)/$(VERSION)/%: $(top_srcdir)/../data/%
$(INSTALL_DATA) $< $@
@ -127,6 +128,10 @@ icudefs.mk: $(srcdir)/icudefs.mk.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
README: $(srcdir)/README.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
Makefile: $(srcdir)/Makefile.in $(srcdir)/icudefs.mk $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

10
icu4c/source/README.in Normal file
View file

@ -0,0 +1,10 @@
The ICU data files moved!
ICU data, which are architecture and/or platform dependent, were moved to
@thelibdir@/@PACKAGE@/@VERSION@
This move happened post ICU 1.6. The rationale for the move is to be able
to share @thedatadir@ across machines with different architectures, as
it is supposed to be the case.

2
icu4c/source/common/Makefile.in
View file

@ -48,7 +48,7 @@ DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)
DEFS = @DEFS@
CPPFLAGS = @CPPFLAGS@ $(LIBCPPFLAGS) -I. -I$(srcdir) -DICU_DATA_DIR=\"$(pkgdatadir)/$(VERSION)/\" -DUDATA_SO_SUFFIX=\".$(SO)\" -DU_COMMON_LIBNAME=\"$(FINAL_SO_TARGET)\"
CPPFLAGS = @CPPFLAGS@ $(LIBCPPFLAGS) -I. -I$(srcdir) -DICU_DATA_DIR=\"$(pkglibdir)/$(VERSION)/\" -DUDATA_SO_SUFFIX=\".$(SO)\" -DU_COMMON_LIBNAME=\"$(FINAL_SO_TARGET)\"
CFLAGS = @CFLAGS@
CXXFLAGS = @CXXFLAGS@
ENABLE_RPATH = @ENABLE_RPATH@

2
icu4c/source/common/putil.c
View file

@ -1056,7 +1056,7 @@ findLibraryPath(char *path, int size) {
#elif defined(XP_MAC)
# define FALLBACK_PATH U_FILE_SEP_STRING "ICU" U_FILE_SEP_STRING U_ICU_VERSION U_FILE_SEP_STRING
#else
# define FALLBACK_PATH U_FILE_SEP_STRING "share" U_FILE_SEP_STRING "icu" U_FILE_SEP_STRING U_ICU_VERSION U_FILE_SEP_STRING
# define FALLBACK_PATH U_FILE_SEP_STRING "lib" U_FILE_SEP_STRING "icu" U_FILE_SEP_STRING U_ICU_VERSION U_FILE_SEP_STRING
#endif
/* #include <stdio.h> */

4
icu4c/source/config/Makefile.inc.in
View file

@ -2,7 +2,7 @@
#******************************************************************************
# Copyright (C) 1999, International Business Machines
# Corporation and others. All Rights Reserved.
# $Revision: 1.15 $
# $Revision: 1.16 $
#******************************************************************************
# This Makefile is designed to be included into projects which make use
# of the ICU.
@ -85,7 +85,7 @@ platform = @platform@
ld_rpath_suf = @ld_rpath_suf@
include $(pkgdatadir)/config/@platform_make_fragment_name@
include $(pkgdatadir)/$(VERSION)/config/@platform_make_fragment_name@
DEFAULT_MODE = @DATA_PACKAGING_MODE@

329
icu4c/source/configure vendored
View file

File diff suppressed because it is too large Load diff

7
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.88 2000/10/24 19:50:05 yves Exp $
dnl $Id: configure.in,v 1.89 2000/10/25 22:26:17 yves Exp $
dnl Process this file with autoconf to produce a configure script
AC_INIT(common/unicode/utypes.h)
@ -34,6 +34,8 @@ 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."
@ -697,7 +699,8 @@ if test "$ac_cv_func_dllload" = "yes"; then
fi
dnl output the Makefiles
AC_OUTPUT([icudefs.mk Makefile \
AC_OUTPUT([README icudefs.mk \
Makefile \
data/Makefile \
common/Makefile config/Makefile.inc i18n/Makefile \
extra/Makefile extra/ustdio/Makefile \

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

@ -32,8 +32,7 @@ UNICODE_VERSION = @UNICODE_VERSION@
# ICU specific directories
pkgdatadir = $(datadir)/$(PACKAGE)
#pkglibdir = $(libdir)/$(PACKAGE)
pkglibdir = $(datadir)/$(PACKAGE)
pkglibdir = $(libdir)/$(PACKAGE)
pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
# Installation programs