--- icu/source/config/icu-config-bottom 2015-10-08 05:54:30.000000000 +0200 +++ icu/source/config/icu-config-bottom 2016-06-07 16:28:42.861210723 +0200 @@ -3,7 +3,7 @@ ## Copyright (c) 2002-2013, International Business Machines Corporation and ## others. All Rights Reserved. -ICUUC_FILE="${libdir}/${ICULIBS_COMMON_LIB_NAME}" +ICUUC_FILE="${bindir}/${ICULIBS_COMMON_LIB_NAME}" ICUUC_FILE_A="${libdir}/${ICULIBS_COMMON_LIB_NAME_A}" # echo ENABLE RPATH $ENABLE_RPATH and RPATHLDFLAGS=${RPATH_LDFLAGS} --- icu/source/config/icu.pc.in 2015-10-08 05:54:32.000000000 +0200 +++ icu/source/config/icu.pc.in 2016-06-07 16:28:42.861210723 +0200 @@ -1,30 +1,30 @@ # Copyright (C) 2010-2013, International Business Machines Corporation. All Rights Reserved. # CFLAGS contains only anything end users should set -CFLAGS = @UCONFIG_CFLAGS@ +CFLAGS=@UCONFIG_CFLAGS@ # CXXFLAGS contains only anything end users should set -CXXFLAGS = @UCONFIG_CXXFLAGS@ +CXXFLAGS=@UCONFIG_CXXFLAGS@ # DEFS only contains those UCONFIG_CPPFLAGS which are not auto-set by platform.h -DEFS = @UCONFIG_CPPFLAGS@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ -#bindir = @bindir@ -libdir = @libdir@ -includedir = @includedir@ -baselibs = @LIBS@ -#datarootdir = @datarootdir@ -#datadir = @datadir@ -#sbindir = @sbindir@ -#mandir = @mandir@ -#sysconfdir = @sysconfdir@ +DEFS=@UCONFIG_CPPFLAGS@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +#bindir=@bindir@ +libdir=@libdir@ +includedir=@includedir@ +baselibs=@LIBS@ +#datarootdir=@datarootdir@ +#datadir=@datadir@ +#sbindir=@sbindir@ +#mandir=@mandir@ +#sysconfdir=@sysconfdir@ UNICODE_VERSION=@UNICODE_VERSION@ ICUPREFIX=icu ICULIBSUFFIX=@ICULIBSUFFIX@ -LIBICU=lib${ICUPREFIX} +LIBICU=${ICUPREFIX} #SHAREDLIBCFLAGS=-fPIC pkglibdir=${libdir}/@PACKAGE@${ICULIBSUFFIX}/@VERSION@ #pkgdatadir=${datadir}/@PACKAGE@${ICULIBSUFFIX}/@VERSION@ -ICUDATA_NAME = icudt@LIB_VERSION_MAJOR@@ICUDATA_CHAR@ +ICUDATA_NAME=icudata@LIB_VERSION_MAJOR@@ICUDATA_CHAR@ #ICUPKGDATA_DIR=@libdir@ #ICUDATA_DIR=${pkgdatadir} ICUDESC=International Components for Unicode --- icu/source/config/Makefile.inc.in 2015-10-08 05:54:32.000000000 +0200 +++ icu/source/config/Makefile.inc.in 2016-06-07 16:28:42.861210723 +0200 @@ -41,7 +41,7 @@ # The prefix for ICU libraries, normally 'icu' ICUPREFIX = icu PACKAGE = @PACKAGE@ -LIBICU = lib$(ICUPREFIX) +LIBICU = $(ICUPREFIX) # Static library prefix and file extension STATIC_PREFIX = s @@ -106,18 +106,19 @@ # - $(ICULIBS_LAYOUT) - ICU layout library. # - $(ICULIBS_ICUIO) - ICU stdio equivalent library -ICULIBS_COMMON = -l$(ICUPREFIX)uc$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) -ICULIBS_DATA = -l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) -ICULIBS_I18N = -l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) -ICULIBS_TOOLUTIL = -l$(ICUPREFIX)tu$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) -ICULIBS_CTESTFW = -l$(ICUPREFIX)ctestfw$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) -ICULIBS_ICUIO = -l$(ICUPREFIX)io$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) -ICULIBS_OBSOLETE = -l$(ICUPREFIX)obsolete$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) -ICULIBS_LAYOUT = -l$(ICUPREFIX)le$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) -ICULIBS_LAYOUTEX = -l$(ICUPREFIX)lx$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) +ICULIBS_COMMON = -l$(ICUPREFIX)uc$(ICULIBSUFFIX) +ICULIBS_DATA = -l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX) +ICULIBS_I18N = -l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX) +ICULIBS_TOOLUTIL = -l$(ICUPREFIX)tu$(ICULIBSUFFIX) +ICULIBS_CTESTFW = -l$(ICUPREFIX)ctestfw$(ICULIBSUFFIX) +ICULIBS_ICUIO = -l$(ICUPREFIX)io$(ICULIBSUFFIX) +ICULIBS_OBSOLETE = -l$(ICUPREFIX)obsolete$(ICULIBSUFFIX) +ICULIBS_LAYOUT = -l$(ICUPREFIX)le$(ICULIBSUFFIX) +ICULIBS_LAYOUTEX = -l$(ICUPREFIX)lx$(ICULIBSUFFIX) ICULIBS_BASE = -L$(libdir) # for icu-config to test with +SO = dll ICULIBS_COMMON_LIB_NAME = ${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO} ICULIBS_COMMON_LIB_NAME_A = ${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}.${A} --- icu/source/config/mh-mingw 2015-10-08 05:54:32.000000000 +0200 +++ icu/source/config/mh-mingw 2016-06-07 16:30:24.974945050 +0200 @@ -66,7 +66,7 @@ endif # Static library prefix and file extension -LIBSICU = lib$(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX) +LIBSICU = lib$(LIBPREFIX)$(ICUPREFIX) A = a ## An import library is needed for z/OS and MSVC @@ -74,20 +74,13 @@ LIBPREFIX= -# Change the stubnames so that poorly working FAT disks and installation programs can work. -# This is also for backwards compatibility. -DATA_STUBNAME = dt -I18N_STUBNAME = in -LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX) +LIBICU = $(ICUPREFIX) #SH### copied from Makefile.inc #SH## for icu-config to test with #SH#ICULIBS_COMMON_LIB_NAME="${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}" #SH#ICULIBS_COMMON_LIB_NAME_A="${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}.${A}" -#SH#ICULIBS_DATA="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)" -#SH#ICULIBS_I18N="-l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)" -#SH# #SH## ICULIBS is the set of libraries your application should link #SH## with usually. Many applications will want to add ${ICULIBS_I18N} as well. #SH#ICULIBS="${ICULIBS_BASE} ${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} " @@ -139,6 +132,9 @@ #ICUPKGDATA_INSTALL_DIR = $(shell cygpath -dma $(DESTDIR)$(ICUPKGDATA_DIR))#M# #ICUPKGDATA_INSTALL_LIBDIR = $(shell cygpath -dma $(DESTDIR)$(libdir))#M# +# The following is for Makefile.inc's use. +ICULIBSUFFIX_VERSION = $(LIB_VERSION_MAJOR) + ## Versioned libraries rules #%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO) # $(RM) $@ && cp ${