From c3e4f0b35b9ef69abdea0af1e686781cc7c7e15b Mon Sep 17 00:00:00 2001 From: Yves Arrouye Date: Fri, 13 Oct 2000 00:26:21 +0000 Subject: [PATCH] ICU-658 bumped version above 1.6 X-SVN-Rev: 2666 --- icu4c/source/Makefile.in | 8 +- icu4c/source/common/Makefile.in | 6 +- icu4c/source/common/unicode/utypes.h | 2 +- icu4c/source/config/Makefile.inc.in | 131 +++++++++--------- icu4c/source/configure | 2 +- icu4c/source/configure.in | 2 +- icu4c/source/data/Makefile.in | 2 +- icu4c/source/extra/Makefile.in | 2 +- icu4c/source/extra/ustdio/Makefile.in | 6 +- icu4c/source/i18n/Makefile.in | 8 +- icu4c/source/samples/Makefile.in | 2 +- icu4c/source/samples/XMLConverter/Makefile.in | 2 +- icu4c/source/samples/cal/Makefile.in | 2 +- icu4c/source/samples/date/Makefile.in | 2 +- icu4c/source/test/Makefile.in | 2 +- icu4c/source/test/cintltst/Makefile.in | 2 +- icu4c/source/test/ieeetest/Makefile.in | 2 +- icu4c/source/test/intltest/Makefile.in | 2 +- icu4c/source/test/testdata/Makefile.in | 2 +- icu4c/source/test/testmap/Makefile.in | 2 +- icu4c/source/tools/Makefile.in | 12 +- icu4c/source/tools/ctestfw/Makefile.in | 2 +- icu4c/source/tools/genccode/Makefile.in | 4 +- icu4c/source/tools/gencmn/Makefile.in | 4 +- icu4c/source/tools/gencnval/Makefile.in | 8 +- icu4c/source/tools/gennames/Makefile.in | 4 +- icu4c/source/tools/genprops/Makefile.in | 4 +- icu4c/source/tools/genrb/Makefile.in | 6 +- icu4c/source/tools/gentest/Makefile.in | 4 +- icu4c/source/tools/gentz/Makefile.in | 4 +- icu4c/source/tools/makeconv/Makefile.in | 8 +- icu4c/source/tools/pkgdata/Makefile.in | 4 +- icu4c/source/tools/rbdump/Makefile.in | 4 +- icu4c/source/tools/toolutil/Makefile.in | 4 +- 34 files changed, 132 insertions(+), 129 deletions(-) diff --git a/icu4c/source/Makefile.in b/icu4c/source/Makefile.in index 39efdf3f63..b66f93cf1c 100644 --- a/icu4c/source/Makefile.in +++ b/icu4c/source/Makefile.in @@ -31,7 +31,7 @@ top_builddir = . subdir = . ## Install program information -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +MKINSTALLDIRS = $(SHELL) $(top_srcdir)/mkinstalldirs INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -111,10 +111,10 @@ clean-recursive-with-twist: all-local: $(srcdir)/configure install-local: $(top_builddir)/config/Makefile.inc $(EXTRA_DATA:%=$(DESTDIR)$(pkgdatadir)/$(VERSION)/%) - @$(mkinstalldirs) $(DESTDIR)$(pkgdatadir) - @$(mkinstalldirs) $(DESTDIR)$(sbindir) + @$(MKINSTALLDIRS) $(DESTDIR)$(pkgdatadir) + @$(MKINSTALLDIRS) $(DESTDIR)$(sbindir) $(INSTALL_DATA) $(top_builddir)/config/Makefile.inc $(DESTDIR)$(pkgdatadir)/Makefile.inc - $(INSTALL_SCRIPT) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sbindir)/mkinstalldirs + $(INSTALL_SCRIPT) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir)/mkinstalldirs $(DESTDIR)$(pkgdatadir)/$(VERSION)/%: $(top_srcdir)/../data/% $(INSTALL_DATA) $< $@ diff --git a/icu4c/source/common/Makefile.in b/icu4c/source/common/Makefile.in index 60ed57dbf2..8df9c4fa0c 100644 --- a/icu4c/source/common/Makefile.in +++ b/icu4c/source/common/Makefile.in @@ -27,7 +27,7 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ ## Install program information -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +MKINSTALLDIRS = $(SHELL) $(top_srcdir)/mkinstalldirs INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -119,7 +119,7 @@ all-local: $(ALL_TARGETS) install-local: install-headers install-library install-library: all-local - $(mkinstalldirs) $(DESTDIR)$(libdir) + $(MKINSTALLDIRS) $(DESTDIR)$(libdir) ifneq ($(ENABLE_STATIC),) $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)/$(TARGET) endif @@ -132,7 +132,7 @@ endif endif install-headers: - $(mkinstalldirs) $(DESTDIR)$(includedir)/unicode + $(MKINSTALLDIRS) $(DESTDIR)$(includedir)/unicode @for file in $(HEADERS); do \ echo "$(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/unicode"; \ $(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/unicode || exit; \ diff --git a/icu4c/source/common/unicode/utypes.h b/icu4c/source/common/unicode/utypes.h index 489457f4c8..c4d23efa30 100644 --- a/icu4c/source/common/unicode/utypes.h +++ b/icu4c/source/common/unicode/utypes.h @@ -82,7 +82,7 @@ /*===========================================================================*/ /* Related version information */ /*===========================================================================*/ -#define U_ICU_VERSION "1.6" +#define U_ICU_VERSION "1.6.1" #define U_MAX_VERSION_LENGTH 4 #define U_VERSION_DELIMITER '.' diff --git a/icu4c/source/config/Makefile.inc.in b/icu4c/source/config/Makefile.inc.in index ebed3b71d1..0d9abf08fa 100644 --- a/icu4c/source/config/Makefile.inc.in +++ b/icu4c/source/config/Makefile.inc.in @@ -2,87 +2,90 @@ #****************************************************************************** # Copyright (C) 1999, International Business Machines # Corporation and others. All Rights Reserved. -# $Revision: 1.9 $ +# $Revision: 1.10 $ #****************************************************************************** # This Makefile is designed to be included into projects which make use # of the ICU. -SHELL=@SHELL@ -CFLAGS=@CFLAGS@ -CPPFLAGS=@CPPFLAGS@ $(LIBCPPFLAGS) -I$(prefix)/include -CXXFLAGS=@CXXFLAGS@ -FFLAGS=@FFLAGS@ -DEFS=@DEFS@ -LDFLAGS=@LDFLAGS@ -L$(prefix)/lib $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) -LIBS=@LIBS@ -ICULIBS=$(LIBS) -licu-uc -licu-i18n -exec_prefix=@exec_prefix@ -prefix=@prefix@ -program_transform_name=@program_transform_name@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -datadir=@datadir@ -sysconfdir=@sysconfdir@ -sharedstatedir=@sharedstatedir@ -localstatedir=@localstatedir@ -libdir=@libdir@ -includedir=@includedir@ -oldincludedir=@oldincludedir@ -infodir=@infodir@ -mandir=@mandir@ -PACKAGE=@PACKAGE@ -VERSION_MAJOR=@VERSION_MAJOR@ -VERSION_MINOR=@VERSION_MINOR@ -VERSION=@VERSION@ -CC=@CC@ -CXX=@CXX@ +SHELL = @SHELL@ +CFLAGS = @CFLAGS@ +CPPFLAGS = @CPPFLAGS@ $(LIBCPPFLAGS) -I$(prefix)/include +CXXFLAGS = @CXXFLAGS@ +FFLAGS = @FFLAGS@ +DEFS = @DEFS@ +LDFLAGS = @LDFLAGS@ -L$(prefix)/lib $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) +LIBS = @LIBS@ +ICULIBS = $(LIBS) -licuuc -licui18n +exec_prefix = @exec_prefix@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +includedir = @includedir@ +oldincludedir = @oldincludedir@ +infodir = @infodir@ +mandir = @mandir@ +PACKAGE = @PACKAGE@ +VERSION_MAJOR = @VERSION_MAJOR@ +VERSION_MINOR = @VERSION_MINOR@ +VERSION = @VERSION@ +CC = @CC@ +CXX = @CXX@ + +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = @INSTALL_DATA@ -INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_DATA = @INSTALL_DATA@ +AUTOCONF = @AUTOCONF@ -INSTALL_PROGRAM=@INSTALL_PROGRAM@ -INSTALL_SCRIPT=@INSTALL_SCRIPT@ -INSTALL_DATA=@INSTALL_DATA@ -AUTOCONF=@AUTOCONF@ -host=@host@ -host_alias=@host_alias@ -host_cpu=@host_cpu@ -host_vendor=@host_vendor@ -host_os=@host_os@ -LIB_M=@LIB_M@ -CPP=@CPP@ -U_HAVE_INTTYPES_H=@U_HAVE_INTTYPES_H@ -U_IS_BIG_ENDIAN=@U_IS_BIG_ENDIAN@ -HAVE_INT8_T=@HAVE_INT8_T@ -HAVE_UINT8_T=@HAVE_UINT8_T@ -HAVE_INT16_T=@HAVE_INT16_T@ -HAVE_UINT16_T=@HAVE_UINT16_T@ -HAVE_INT32_T=@HAVE_INT32_T@ -HAVE_UINT32_T=@HAVE_UINT32_T@ -HAVE_BOOL_T=@HAVE_BOOL_T@ -EXTRAS_TRUE=@EXTRAS_TRUE@ -EXTRAS_FALSE=@EXTRAS_FALSE@ -TESTS_TRUE=@TESTS_TRUE@ -TESTS_FALSE=@TESTS_FALSE@ -SAMPLES_TRUE=@SAMPLES_TRUE@ -SAMPLES_FALSE=@SAMPLES_FALSE@ -platform=@platform@ +MKINSTALLDIRS = $(SHELL) $(datadir)/$(PACKAGE)/mkinstalldirs +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_vendor = @host_vendor@ +host_os = @host_os@ -ld_rpath_suf=@ld_rpath_suf@ +LIB_M = @LIB_M@ +CPP = @CPP@ +U_HAVE_INTTYPES_H = @U_HAVE_INTTYPES_H@ +U_IS_BIG_ENDIAN = @U_IS_BIG_ENDIAN@ +HAVE_INT8_T = @HAVE_INT8_T@ +HAVE_UINT8_T = @HAVE_UINT8_T@ +HAVE_INT16_T = @HAVE_INT16_T@ +HAVE_UINT16_T = @HAVE_UINT16_T@ +HAVE_INT32_T = @HAVE_INT32_T@ +HAVE_UINT32_T = @HAVE_UINT32_T@ +HAVE_BOOL_T = @HAVE_BOOL_T@ +EXTRAS_TRUE = @EXTRAS_TRUE@ +EXTRAS_FALSE = @EXTRAS_FALSE@ +TESTS_TRUE = @TESTS_TRUE@ +TESTS_FALSE = @TESTS_FALSE@ +SAMPLES_TRUE = @SAMPLES_TRUE@ +SAMPLES_FALSE = @SAMPLES_FALSE@ +platform = @platform@ + +ld_rpath_suf = @ld_rpath_suf@ # begin host fragment @host_frag@ # end host fragment -DEFAULT_MODE=@DATA_PACKAGING_MODE@ +DEFAULT_MODE = @DATA_PACKAGING_MODE@ -GENCCODE=$(sbindir)/genccode -GENCMN=$(sbindir)/gencmn +GENCCODE = $(sbindir)/genccode +GENCMN = $(sbindir)/gencmn -INVOKE=$(LDLIBRARYPATH_ENVVAR)=$(libdir):$$$(LDLIBRARYPATH_ENVVAR) +INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(libdir):$$$(LDLIBRARYPATH_ENVVAR) diff --git a/icu4c/source/configure b/icu4c/source/configure index c578ba688b..027a2750af 100755 --- a/icu4c/source/configure +++ b/icu4c/source/configure @@ -550,7 +550,7 @@ fi PACKAGE="icu" -VERSION=1.6 +VERSION=1.6.1 VERSION_MAJOR=`echo $VERSION | sed 's/\..*//'` diff --git a/icu4c/source/configure.in b/icu4c/source/configure.in index 1864b2a1bd..c4038f284c 100644 --- a/icu4c/source/configure.in +++ b/icu4c/source/configure.in @@ -10,7 +10,7 @@ AC_INIT(common/unicode/utypes.h) AC_CONFIG_HEADER(common/icucfg.h) PACKAGE="icu" AC_SUBST(PACKAGE) -VERSION=1.6 +VERSION=1.6.1 VERSION_MAJOR=`echo $VERSION | sed 's/\..*//'` AC_SUBST(VERSION) AC_SUBST(VERSION_MAJOR) diff --git a/icu4c/source/data/Makefile.in b/icu4c/source/data/Makefile.in index 32ae8c2da1..343ec0cd74 100644 --- a/icu4c/source/data/Makefile.in +++ b/icu4c/source/data/Makefile.in @@ -31,7 +31,7 @@ top_builddir = .. subdir = data ## Install program information -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +MKINSTALLDIRS = $(SHELL) $(top_srcdir)/mkinstalldirs INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/icu4c/source/extra/Makefile.in b/icu4c/source/extra/Makefile.in index 3b8f467b88..fee80d5288 100644 --- a/icu4c/source/extra/Makefile.in +++ b/icu4c/source/extra/Makefile.in @@ -31,7 +31,7 @@ top_builddir = .. subdir = extra ## Install program information -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +MKINSTALLDIRS = $(SHELL) $(top_srcdir)/mkinstalldirs INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/icu4c/source/extra/ustdio/Makefile.in b/icu4c/source/extra/ustdio/Makefile.in index 16271d1a24..92c0d8a1a5 100644 --- a/icu4c/source/extra/ustdio/Makefile.in +++ b/icu4c/source/extra/ustdio/Makefile.in @@ -27,7 +27,7 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ ## Install program information -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +MKINSTALLDIRS = $(SHELL) $(top_srcdir)/mkinstalldirs INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -112,7 +112,7 @@ all-local: $(ALL_TARGETS) install-local: all-local install-headers install-library install-library: all-local - $(mkinstalldirs) $(DESTDIR)$(libdir) + $(MKINSTALLDIRS) $(DESTDIR)$(libdir) ifneq ($(ENABLE_STATIC),) $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)/$(TARGET) endif @@ -125,7 +125,7 @@ endif endif install-headers: - $(mkinstalldirs) $(DESTDIR)$(includedir)/unicode + $(MKINSTALLDIRS) $(DESTDIR)$(includedir)/unicode @for file in $(HEADERS); do \ echo " $(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/unicode"; \ $(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/unicode || exit; \ diff --git a/icu4c/source/i18n/Makefile.in b/icu4c/source/i18n/Makefile.in index cd16e9195f..27218753e9 100644 --- a/icu4c/source/i18n/Makefile.in +++ b/icu4c/source/i18n/Makefile.in @@ -1,4 +1,4 @@ -## Makefile.in for ICU - icu-i18n.so +## Makefile.in for ICU - icui18n.so ## Stephen F. Booth ## Shell to use @@ -21,7 +21,7 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ ## Install program information -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +MKINSTALLDIRS = $(SHELL) $(top_srcdir)/mkinstalldirs INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -116,7 +116,7 @@ all-local: $(ALL_TARGETS) install-local: install-headers install-library install-library: all-local - $(mkinstalldirs) $(DESTDIR)$(libdir) + $(MKINSTALLDIRS) $(DESTDIR)$(libdir) ifneq ($(ENABLE_STATIC),) $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)/$(TARGET) endif @@ -129,7 +129,7 @@ endif endif install-headers: - $(mkinstalldirs) $(DESTDIR)$(includedir)/unicode + $(MKINSTALLDIRS) $(DESTDIR)$(includedir)/unicode @for file in $(HEADERS); do \ echo " $(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/unicode"; \ $(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/unicode || exit; \ diff --git a/icu4c/source/samples/Makefile.in b/icu4c/source/samples/Makefile.in index fde8c9d4a0..2f681279e0 100644 --- a/icu4c/source/samples/Makefile.in +++ b/icu4c/source/samples/Makefile.in @@ -26,7 +26,7 @@ top_builddir = .. subdir = samples ## Install program information -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +MKINSTALLDIRS = $(SHELL) $(top_srcdir)/mkinstalldirs INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/icu4c/source/samples/XMLConverter/Makefile.in b/icu4c/source/samples/XMLConverter/Makefile.in index 7eaa747d7e..928eed9a6e 100644 --- a/icu4c/source/samples/XMLConverter/Makefile.in +++ b/icu4c/source/samples/XMLConverter/Makefile.in @@ -22,7 +22,7 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ ## Install program information -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +MKINSTALLDIRS = $(SHELL) $(top_srcdir)/mkinstalldirs INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/icu4c/source/samples/cal/Makefile.in b/icu4c/source/samples/cal/Makefile.in index 693dd00550..90cfbaf393 100644 --- a/icu4c/source/samples/cal/Makefile.in +++ b/icu4c/source/samples/cal/Makefile.in @@ -22,7 +22,7 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ ## Install program information -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +MKINSTALLDIRS = $(SHELL) $(top_srcdir)/mkinstalldirs INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/icu4c/source/samples/date/Makefile.in b/icu4c/source/samples/date/Makefile.in index 89a25f0124..a327690b39 100644 --- a/icu4c/source/samples/date/Makefile.in +++ b/icu4c/source/samples/date/Makefile.in @@ -22,7 +22,7 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ ## Install program information -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +MKINSTALLDIRS = $(SHELL) $(top_srcdir)/mkinstalldirs INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/icu4c/source/test/Makefile.in b/icu4c/source/test/Makefile.in index 6b849ad162..b824e7c440 100644 --- a/icu4c/source/test/Makefile.in +++ b/icu4c/source/test/Makefile.in @@ -27,7 +27,7 @@ top_builddir = .. subdir = test ## Install program information -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +MKINSTALLDIRS = $(SHELL) $(top_srcdir)/mkinstalldirs INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/icu4c/source/test/cintltst/Makefile.in b/icu4c/source/test/cintltst/Makefile.in index 0d0dfa14b4..c081324b29 100644 --- a/icu4c/source/test/cintltst/Makefile.in +++ b/icu4c/source/test/cintltst/Makefile.in @@ -25,7 +25,7 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ ## Install program information -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +MKINSTALLDIRS = $(SHELL) $(top_srcdir)/mkinstalldirs INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/icu4c/source/test/ieeetest/Makefile.in b/icu4c/source/test/ieeetest/Makefile.in index d1b15b841a..a3ec4d6016 100644 --- a/icu4c/source/test/ieeetest/Makefile.in +++ b/icu4c/source/test/ieeetest/Makefile.in @@ -22,7 +22,7 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ ## Install program information -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +MKINSTALLDIRS = $(SHELL) $(top_srcdir)/mkinstalldirs INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/icu4c/source/test/intltest/Makefile.in b/icu4c/source/test/intltest/Makefile.in index 1f1c15f75a..41f2c969ae 100644 --- a/icu4c/source/test/intltest/Makefile.in +++ b/icu4c/source/test/intltest/Makefile.in @@ -22,7 +22,7 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ ## Install program information -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +MKINSTALLDIRS = $(SHELL) $(top_srcdir)/mkinstalldirs INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/icu4c/source/test/testdata/Makefile.in b/icu4c/source/test/testdata/Makefile.in index 6dac9c280e..b4d407b208 100644 --- a/icu4c/source/test/testdata/Makefile.in +++ b/icu4c/source/test/testdata/Makefile.in @@ -31,7 +31,7 @@ top_builddir = ../.. subdir = test/testdata ## Install program information -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +MKINSTALLDIRS = $(SHELL) $(top_srcdir)/mkinstalldirs INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/icu4c/source/test/testmap/Makefile.in b/icu4c/source/test/testmap/Makefile.in index d751a44848..9948772244 100644 --- a/icu4c/source/test/testmap/Makefile.in +++ b/icu4c/source/test/testmap/Makefile.in @@ -24,7 +24,7 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ ## Install program information -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +MKINSTALLDIRS = $(SHELL) $(top_srcdir)/mkinstalldirs INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/icu4c/source/tools/Makefile.in b/icu4c/source/tools/Makefile.in index e9863aade9..ccda6fb812 100644 --- a/icu4c/source/tools/Makefile.in +++ b/icu4c/source/tools/Makefile.in @@ -63,7 +63,7 @@ INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir_from_tmp)/common:$(top_builddir_ PKGDATA = ../pkgdata/pkgdata -T . -s $(DATABUILDDIR) -O ./icupkg.inc -d $(DATABUILDDIR) -m $(MODE) ## Install program information -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +MKINSTALLDIRS = $(SHELL) $(top_srcdir)/mkinstalldirs INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -182,30 +182,30 @@ distclean-local: clean-local $(TMPDATADIR)/icudata.lst: Makefile $(srcdir)/Makefile.in $(srcdir)/genrb/genrbfiles.mk $(srcdir)/makeconv/ucmfiles.mk @echo Generating $@ list of data files - @$(mkinstalldirs) $(TMPDATADIR) + @$(MKINSTALLDIRS) $(TMPDATADIR) @-$(RMV) $(TMPDATADIR)/icudata.lst @for file in $(DATAFILES); do \ echo $$file >> $(TMPDATADIR)/icudata.lst; \ done; $(TMPDATADIR)/testdata.lst: Makefile - @$(mkinstalldirs) $(TMPDATADIR) + @$(MKINSTALLDIRS) $(TMPDATADIR) @echo $(DATABUILDDIR)/test.dat > $@ $(TMPDATADIR)/icupkg.inc: pkgdata/icupkg.inc - @$(mkinstalldirs) $(TMPDATADIR) + @$(MKINSTALLDIRS) $(TMPDATADIR) cp pkgdata/icupkg.inc $(TMPDATADIR)/icupkg.inc # build the ICU and test data build-local build-pkgdata: $(TMPDATADIR)/icudata.lst $(TMPDATADIR)/testdata.lst $(TMPDATADIR)/icupkg.inc $(DATAFILES) - @$(mkinstalldirs) $(TMPDATADIR) + @$(MKINSTALLDIRS) $(TMPDATADIR) (cd $(TMPDATADIR); $(INVOKE) $(PKGDATA) -p icudata ./icudata.lst ) (cd $(TMPDATADIR); $(INVOKE) $(PKGDATA) -p testdat1 ./testdata.lst ) (cd $(TMPDATADIR); $(INVOKE) $(PKGDATA) -p testdat2 ./testdata.lst ) install-pkgdata: $(TMPDATADIR)/icudata.lst $(TMPDATADIR)/icupkg.inc - $(mkinstalldirs) $(TMPDATADIR) $(DESTDIR)$(pkgdatadir)/$(VERSION) + $(MKINSTALLDIRS) $(TMPDATADIR) $(DESTDIR)$(pkgdatadir)/$(VERSION) (cd $(TMPDATADIR); $(INVOKE) $(PKGDATA) -p icudata ./icudata.lst -I $(DESTDIR)$(pkgdatadir)/$(VERSION) ) diff --git a/icu4c/source/tools/ctestfw/Makefile.in b/icu4c/source/tools/ctestfw/Makefile.in index a9074bb389..f343520cc7 100644 --- a/icu4c/source/tools/ctestfw/Makefile.in +++ b/icu4c/source/tools/ctestfw/Makefile.in @@ -23,7 +23,7 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ ## Install program information -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +MKINSTALLDIRS = $(SHELL) $(top_srcdir)/mkinstalldirs INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/icu4c/source/tools/genccode/Makefile.in b/icu4c/source/tools/genccode/Makefile.in index 644a8c3e98..2bd54b75f7 100644 --- a/icu4c/source/tools/genccode/Makefile.in +++ b/icu4c/source/tools/genccode/Makefile.in @@ -23,7 +23,7 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ ## Install program information -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +MKINSTALLDIRS = $(SHELL) $(top_srcdir)/mkinstalldirs INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -82,7 +82,7 @@ check: all check-local all-local: $(TARGET) $(RES_FILES) $(TRANSLIT_RES) $(TEST_FILES) install-local: all-local - $(mkinstalldirs) $(DESTDIR)$(sbindir) + $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)/$(TARGET) dist-local: diff --git a/icu4c/source/tools/gencmn/Makefile.in b/icu4c/source/tools/gencmn/Makefile.in index ac4268b3dc..e3a6710be7 100644 --- a/icu4c/source/tools/gencmn/Makefile.in +++ b/icu4c/source/tools/gencmn/Makefile.in @@ -23,7 +23,7 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ ## Install program information -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +MKINSTALLDIRS = $(SHELL) $(top_srcdir)/mkinstalldirs INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -90,7 +90,7 @@ check: all check-local all-local: $(TARGET) $(RES_FILES) $(TRANSLIT_RES) $(TEST_FILES) install-local: all-local - $(mkinstalldirs) $(DESTDIR)$(sbindir) + $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)/$(TARGET) dist-local: diff --git a/icu4c/source/tools/gencnval/Makefile.in b/icu4c/source/tools/gencnval/Makefile.in index c61d3915f8..6db634d4ec 100644 --- a/icu4c/source/tools/gencnval/Makefile.in +++ b/icu4c/source/tools/gencnval/Makefile.in @@ -37,7 +37,7 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ ## Install program information -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +MKINSTALLDIRS = $(SHELL) $(top_srcdir)/mkinstalldirs INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -98,7 +98,7 @@ check: all check-local all-local: $(TARGET) $(ALL_MAN_FILES) build-data install-local: all-local build-data install-man - $(mkinstalldirs) $(DESTDIR)$(sbindir) + $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)/$(TARGET) build-data: $(ICUDATADIR)/cnvalias.dat @@ -129,10 +129,10 @@ $(TARGET) : $(OBJECTS) # man page install-man: install-man5 install-manx install-man5: $(MAN5_FILES) - $(mkinstalldirs) $(DESTDIR)$(mandir)/man5 + $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man5 $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man5 install-manx: $(MANX_FILES) - $(mkinstalldirs) $(DESTDIR)$(mandir)/man$(SECTION) + $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION) %.$(SECTION): $(srcdir)/%.$(SECTION).in diff --git a/icu4c/source/tools/gennames/Makefile.in b/icu4c/source/tools/gennames/Makefile.in index 0acdac366c..f22a374f60 100644 --- a/icu4c/source/tools/gennames/Makefile.in +++ b/icu4c/source/tools/gennames/Makefile.in @@ -29,7 +29,7 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ ## Install program information -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +MKINSTALLDIRS = $(SHELL) $(top_srcdir)/mkinstalldirs INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -90,7 +90,7 @@ check: all check-local all-local: $(TARGET) build-data install-local: all-local build-data - $(mkinstalldirs) $(DESTDIR)$(sbindir) + $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)/$(TARGET) build-data: $(ICUDATADIR)/unames.dat diff --git a/icu4c/source/tools/genprops/Makefile.in b/icu4c/source/tools/genprops/Makefile.in index 773e071696..4f954f4a2a 100644 --- a/icu4c/source/tools/genprops/Makefile.in +++ b/icu4c/source/tools/genprops/Makefile.in @@ -28,7 +28,7 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ ## Install program information -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +MKINSTALLDIRS = $(SHELL) $(top_srcdir)/mkinstalldirs INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -88,7 +88,7 @@ check: all check-local all-local: $(TARGET) build-data install-local: all-local build-data - $(mkinstalldirs) $(DESTDIR)$(sbindir) + $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)/$(TARGET) build-data: $(ICUDATADIR)/uprops.dat diff --git a/icu4c/source/tools/genrb/Makefile.in b/icu4c/source/tools/genrb/Makefile.in index 9722673232..f0cdc70df0 100644 --- a/icu4c/source/tools/genrb/Makefile.in +++ b/icu4c/source/tools/genrb/Makefile.in @@ -23,7 +23,7 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ ## Install program information -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +MKINSTALLDIRS = $(SHELL) $(top_srcdir)/mkinstalldirs INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -115,7 +115,7 @@ check: all check-local all-local: $(TARGET) $(MAN_FILES) $(RES_FILES) $(TRANSLIT_RES) $(TEST_FILES) install-local: all-local install-man - $(mkinstalldirs) $(DESTDIR)$(sbindir) + $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) $(INSTALL) $(TARGET) $(DESTDIR)$(sbindir)/$(TARGET)