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

ICU-1404 let's simplify things, and make ICUDATA_DIR contain the

Browse source 
$(VERSION) part. We only need to go above that for the current symlink.

X-SVN-Rev: 6728
This commit is contained in:
Yves Arrouye 2001-11-10 02:21:37 +00:00
parent 7ba140fec6
commit 4325059629
6 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
icu4c/source/Makefile.in
View file

@ -86,19 +86,19 @@ clean-recursive-with-twist:
all-local: $(srcdir)/configure icudefs.mk
install-local: $(top_builddir)/config/Makefile.inc @platform_make_fragment@ README $(EXTRA_DATA:%=$(DESTDIR)$(pkglibdir)/$(VERSION)/%)
@$(MKINSTALLDIRS) $(DESTDIR)$(pkgdatadir)/$(VERSION)/config
@$(MKINSTALLDIRS) $(DESTDIR)$(pkglibdir)/$(VERSION)
install-local: $(top_builddir)/config/Makefile.inc @platform_make_fragment@ README $(EXTRA_DATA:%=$(DESTDIR)$(pkglibdir)/%)
@$(MKINSTALLDIRS) $(DESTDIR)$(pkgdatadir)/config
@$(MKINSTALLDIRS) $(DESTDIR)$(pkglibdir)
@$(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
$(INSTALL_DATA) $(top_builddir)/config/Makefile.inc $(DESTDIR)$(pkglibdir)/$(VERSION)/Makefile$(ICULIBSUFFIX).inc
cd $(DESTDIR)$(pkglibdir); \
$(INSTALL_DATA) $(top_builddir)/config/Makefile.inc $(DESTDIR)$(pkglibdir)/Makefile$(ICULIBSUFFIX).inc
cd $(DESTDIR)$(pkglibdir)/..; \
$(RM) current && ln -s $(VERSION) current; \
$(RM) Makefile$(ICULIBSUFFIX).inc && ln -s current/Makefile$(ICULIBSUFFIX).inc .
$(INSTALL_DATA) @platform_make_fragment@ $(DESTDIR)$(pkgdatadir)/$(VERSION)/config/@platform_make_fragment_name@
$(INSTALL_DATA) @platform_make_fragment@ $(DESTDIR)$(pkgdatadir)/config/@platform_make_fragment_name@
$(INSTALL_SCRIPT) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir)/mkinstalldirs
$(INSTALL_DATA) README $(DESTDIR)$(pkgdatadir)/$(VERSION)/README
$(INSTALL_DATA) README $(DESTDIR)$(pkgdatadir)/README
$(DESTDIR)$(pkglibdir)/$(VERSION)/%: $(top_srcdir)/../data/%
$(DESTDIR)$(pkglibdir)/%: $(top_srcdir)/../data/%
$(INSTALL_DATA) $< $@
## Generate HTML documentation

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

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

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

@ -2,7 +2,7 @@
#******************************************************************************
# Copyright (C) 1999-2001, International Business Machines
# Corporation and others. All Rights Reserved.
# $Revision: 1.20 $
# $Revision: 1.21 $
#******************************************************************************
# This Makefile is designed to be included into projects which make use
# of the ICU.
@ -53,8 +53,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_DATA = @INSTALL_DATA@
AUTOCONF = @AUTOCONF@
pkgdatadir = $(datadir)/$(PACKAGE)
pkglibdir = $(libdir)/$(PACKAGE)
pkgdatadir = $(datadir)/$(PACKAGE)/$(VERSION)
pkglibdir = $(libdir)/$(PACKAGE)/$(VERSION)
MKINSTALLDIRS = $(SHELL) $(pkgdatadir)/mkinstalldirs

4
icu4c/source/extra/uconv/Makefile.in
View file

@ -100,8 +100,8 @@ $(RESDIR)/$(RESDIR).lst: Makefile $(srcdir)/resfiles.mk
done;
install-resfiles: $(RESFILES)
$(MKINSTALLDIRS) $(DESTDIR)$(ICUDATA_DIR)/$(VERSION)
$(INVOKE) $(top_builddir)/tools/pkgdata/pkgdata -p $(RESDIR) -O $(top_builddir)/tools/pkgdata/icupkg.inc -m common -d uconvmsg -I $(DESTDIR)$(ICUDATA_DIR)/$(VERSION) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst
$(MKINSTALLDIRS) $(DESTDIR)$(ICUDATA_DIR)
$(INVOKE) $(top_builddir)/tools/pkgdata/pkgdata -p $(RESDIR) -O $(top_builddir)/tools/pkgdata/icupkg.inc -m common -d uconvmsg -I $(DESTDIR)$(ICUDATA_DIR) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst
$(RESDIR)/%.res: $(srcdir)/%.txt
@$(MKINSTALLDIRS) $(RESDIR)

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

@ -43,21 +43,21 @@ PKGDATA_MODE=@DATA_PACKAGING_MODE@
endif
ifeq ($(PKGDATA_MODE),common)
ICUDATA_DIR = $(pkgdatadir)
ICUPKGDATA_DIR = $(ICUDATA_DIR)/$(VERSION)
ICUPKGDATA_DIR = $(ICUDATA_DIR)
else
ifeq ($(PKGDATA_MODE),dll)
ICUDATA_DIR = $(pkgdatadir)
ICUPKGDATA_DIR = $(libdir)
else
ICUDATA_DIR = $(pkglibdir)
ICUPKGDATA_DIR = $(ICUDATA_DIR)/$(VERSION)
ICUPKGDATA_DIR = $(ICUDATA_DIR)
endif
endif
# ICU specific directories
pkgdatadir = $(datadir)/$(PACKAGE)
pkglibdir = $(libdir)/$(PACKAGE)
pkgdatadir = $(datadir)/$(PACKAGE)/$(VERSION)
pkglibdir = $(libdir)/$(PACKAGE)/$(VERSION)
pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
# Installation programs

6
icu4c/source/tools/makeconv/Makefile.in
View file

@ -79,10 +79,10 @@ all-local: $(TARGET) $(ALL_MAN_FILES)
install-local: all-local install-man
$(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
$(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)/$(TARGET)
# $(MKINSTALLDIRS) $(DESTDIR)$(pkglibdir)/$(VERSION)
# $(MKINSTALLDIRS) $(DESTDIR)$(pkglibdir)
# @list='$(notdir $(CNV_FILES)) convrtrs.txt'; for file in $$list; do \
# echo $(INSTALL_DATA) $(top_builddir)/data/$$file $(DESTDIR)$(pkglibdir)/$(VERSION)/$$file; \
# $(INSTALL_DATA) $(top_builddir)/data/$$file $(DESTDIR)$(pkglibdir)/$(VERSION)/$$file; \
# echo $(INSTALL_DATA) $(top_builddir)/data/$$file $(DESTDIR)$(pkglibdir)/$$file; \
# $(INSTALL_DATA) $(top_builddir)/data/$$file $(DESTDIR)$(pkglibdir)/$$file; \
# done
dist-local: