From 7202cadd367a8b9f0247d788439dabe0cbef49f9 Mon Sep 17 00:00:00 2001 From: Andy Heninger Date: Wed, 31 Oct 2001 18:43:45 +0000 Subject: [PATCH] ICU-1404 configure, fix broken --with-data-packaging option X-SVN-Rev: 6521 --- icu4c/source/data/build/Makefile.in | 1 - icu4c/source/extra/scrptrun/Makefile.in | 1 - icu4c/source/extra/uconv/Makefile.in | 1 - icu4c/source/extra/ustdio/Makefile.in | 5 ++++- icu4c/source/i18n/Makefile.in | 3 +++ icu4c/source/icudefs.mk.in | 4 ++-- icu4c/source/layout/Makefile.in | 3 +++ icu4c/source/samples/cal/Makefile.in | 1 - icu4c/source/samples/date/Makefile.in | 1 - icu4c/source/stubdata/Makefile.in | 3 +++ icu4c/source/test/cintltst/Makefile.in | 1 - icu4c/source/test/collperf/Makefile.in | 1 - icu4c/source/test/ieeetest/Makefile.in | 1 - icu4c/source/test/intltest/Makefile.in | 1 - icu4c/source/test/letest/Makefile.in | 1 - icu4c/source/test/testmap/Makefile.in | 1 - icu4c/source/test/thaitest/Makefile.in | 1 - icu4c/source/tools/ctestfw/Makefile.in | 3 +++ icu4c/source/tools/dumpce/Makefile.in | 1 - icu4c/source/tools/gencnval/Makefile.in | 1 - icu4c/source/tools/gennames/Makefile.in | 1 - icu4c/source/tools/gennorm/Makefile.in | 1 - icu4c/source/tools/genprops/Makefile.in | 1 - icu4c/source/tools/gentest/Makefile.in | 1 - icu4c/source/tools/gentz/Makefile.in | 1 - icu4c/source/tools/makeconv/Makefile.in | 1 - icu4c/source/tools/toolutil/Makefile.in | 3 +++ 27 files changed, 21 insertions(+), 23 deletions(-) diff --git a/icu4c/source/data/build/Makefile.in b/icu4c/source/data/build/Makefile.in index f6620a51ef8..f8dad2e6668 100644 --- a/icu4c/source/data/build/Makefile.in +++ b/icu4c/source/data/build/Makefile.in @@ -27,7 +27,6 @@ SRCLISTDEPS=Makefile $(srcdir)/Makefile.in $(SRCDATADIR)/resfiles.mk $(SRCDATADI OBJDATADIR=. # relative lib links from pkgdata are the same as for tmp -INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/common:$(top_builddir)/i18n:$(top_builddir)/tools/toolutil:$(top_builddir)/extra/ustdio:$(top_builddir)/stubdata/:$$$(LDLIBRARYPATH_ENVVAR) TOOLDIR=$(top_builddir)/tools ## List of phony targets diff --git a/icu4c/source/extra/scrptrun/Makefile.in b/icu4c/source/extra/scrptrun/Makefile.in index feca633b65e..01c700e5878 100644 --- a/icu4c/source/extra/scrptrun/Makefile.in +++ b/icu4c/source/extra/scrptrun/Makefile.in @@ -31,7 +31,6 @@ ifeq ($(ENABLE_RPATH),YES) RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) endif LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) -INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/common:$(top_builddir)/i18n:$(top_builddir)/tools/toolutil:$$$(LDLIBRARYPATH_ENVVAR) LIBS = $(LIBICUUC) @LIBS@ @LIB_M@ OBJECTS = scrptrun.o srtest.o diff --git a/icu4c/source/extra/uconv/Makefile.in b/icu4c/source/extra/uconv/Makefile.in index 526f31f1377..1600c416323 100644 --- a/icu4c/source/extra/uconv/Makefile.in +++ b/icu4c/source/extra/uconv/Makefile.in @@ -39,7 +39,6 @@ ifeq ($(ENABLE_RPATH),YES) RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) endif LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) -INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/common:$(top_builddir)/data:$(top_builddir)/i18n:$(top_builddir)/tools/toolutil:$$$(LDLIBRARYPATH_ENVVAR) LIBS = $(LIBICUI18N) $(LIBICUUC) @LIBS@ @LIB_M@ OBJECTS = uconv.o uwmsg.o diff --git a/icu4c/source/extra/ustdio/Makefile.in b/icu4c/source/extra/ustdio/Makefile.in index 539f9ac568f..821178b5bd5 100644 --- a/icu4c/source/extra/ustdio/Makefile.in +++ b/icu4c/source/extra/ustdio/Makefile.in @@ -7,6 +7,9 @@ ## Makefile.in for ICU - extra/ustdio/libustdio.so ## Stephen F. Booth +SO_TARGET_VERSION = @LIB_VERSION@ +SO_TARGET_VERSION_MAJOR = @LIB_VERSION_MAJOR@ + ## Install directory information srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -128,7 +131,7 @@ endif ifneq ($(ENABLE_SHARED),) $(FINAL_SO_TARGET): $(OBJECTS) - $(SHLIB.cc) $(LD_SONAME) -o $@ $^ $(LIBS) + $(SHLIB.c) $(LD_SONAME) -o $@ $^ $(LIBS) endif ifeq (,$(MAKECMDGOALS)) diff --git a/icu4c/source/i18n/Makefile.in b/icu4c/source/i18n/Makefile.in index 46bb87d300f..b8dbb49fadb 100644 --- a/icu4c/source/i18n/Makefile.in +++ b/icu4c/source/i18n/Makefile.in @@ -7,6 +7,9 @@ ## Makefile.in for ICU - icui18n.so ## Stephen F. Booth +SO_TARGET_VERSION = @LIB_VERSION@ +SO_TARGET_VERSION_MAJOR = @LIB_VERSION_MAJOR@ + ## Install directory information srcdir = @srcdir@ top_srcdir = @top_srcdir@ diff --git a/icu4c/source/icudefs.mk.in b/icu4c/source/icudefs.mk.in index 9d1d4ae616c..c89382feb15 100644 --- a/icu4c/source/icudefs.mk.in +++ b/icu4c/source/icudefs.mk.in @@ -32,8 +32,6 @@ sysconfdir = @sysconfdir@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ UNICODE_VERSION = @UNICODE_VERSION@ -SO_TARGET_VERSION = @LIB_VERSION@ -SO_TARGET_VERSION_MAJOR = @LIB_VERSION_MAJOR@ # Should be the same as U_ICUDATA_NAME ICUDATA_BASENAME_VERSION = icudt@LIB_VERSION_MAJOR@ @@ -115,3 +113,5 @@ LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -l$(ICUPREFIX)ctestfw$(ICULIBSUF LIBICUTOOLUTIL= -L$(top_builddir)/tools/toolutil -l$(ICUPREFIX)toolutil$(ICULIBSUFFIX) LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio$(ICULIBSUFFIX) +# Invoke, set library path for all ICU libraries. +INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/common:$(top_builddir)/i18n:$(top_builddir)/tools/toolutil:$(top_builddir)/extra/ustdio:$(top_builddir)/tools/ctestfw:$(top_builddir)/data:$(top_builddir)/stubdata/:$$$(LDLIBRARYPATH_ENVVAR) diff --git a/icu4c/source/layout/Makefile.in b/icu4c/source/layout/Makefile.in index 7717633d5b3..f93da29f934 100644 --- a/icu4c/source/layout/Makefile.in +++ b/icu4c/source/layout/Makefile.in @@ -1,5 +1,8 @@ ## Makefile.in for ICU - layout +SO_TARGET_VERSION = @LIB_VERSION@ +SO_TARGET_VERSION_MAJOR = @LIB_VERSION_MAJOR@ + ## Install directory information srcdir = @srcdir@ top_srcdir = @top_srcdir@ diff --git a/icu4c/source/samples/cal/Makefile.in b/icu4c/source/samples/cal/Makefile.in index f96b3f8f9e6..f86238f1ce4 100644 --- a/icu4c/source/samples/cal/Makefile.in +++ b/icu4c/source/samples/cal/Makefile.in @@ -39,7 +39,6 @@ ifeq ($(ENABLE_RPATH),YES) RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) endif LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) -INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/common:$(top_builddir)/i18n:$(top_bilddir)/source/data:$$$(LDLIBRARYPATH_ENVVAR) LIBS = $(LIBICUI18N) $(LIBICUUC) @LIBS@ @LIB_M@ OBJECTS = uprint.o cal.o diff --git a/icu4c/source/samples/date/Makefile.in b/icu4c/source/samples/date/Makefile.in index 2acb5709666..fb022219f1f 100644 --- a/icu4c/source/samples/date/Makefile.in +++ b/icu4c/source/samples/date/Makefile.in @@ -39,7 +39,6 @@ ifeq ($(ENABLE_RPATH),YES) RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) endif LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) -INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/common:$(top_builddir)/i18n:$(top_bilddir)/source/data:$$$(LDLIBRARYPATH_ENVVAR) LIBS = $(LIBICUI18N) $(LIBICUUC) @LIBS@ @LIB_M@ OBJECTS = uprint.o date.o diff --git a/icu4c/source/stubdata/Makefile.in b/icu4c/source/stubdata/Makefile.in index 5466e4dc6c7..1bc13f9200a 100644 --- a/icu4c/source/stubdata/Makefile.in +++ b/icu4c/source/stubdata/Makefile.in @@ -7,6 +7,9 @@ ## Makefile.in for ICU extras ## Stephen F. Booth +SO_TARGET_VERSION = @LIB_VERSION@ +SO_TARGET_VERSION_MAJOR = @LIB_VERSION_MAJOR@ + ## Install directory information srcdir = @srcdir@ top_srcdir = @top_srcdir@ diff --git a/icu4c/source/test/cintltst/Makefile.in b/icu4c/source/test/cintltst/Makefile.in index ee8e23e36fa..2ec1ec2fec0 100644 --- a/icu4c/source/test/cintltst/Makefile.in +++ b/icu4c/source/test/cintltst/Makefile.in @@ -48,7 +48,6 @@ ifeq ($(ENABLE_RPATH),YES) RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) endif LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) -INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/common:$(top_builddir)/i18n:$(top_builddir)/tools/ctestfw:$(top_builddir)/tools/toolutil:$(top_builddir)/data:$$$(LDLIBRARYPATH_ENVVAR) LIBS = $(LIBCTESTFW) $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) @LIBS@ @LIB_M@ OBJECTS = callcoll.o calltest.o capitst.o cbiapts.o cbkittst.o \ diff --git a/icu4c/source/test/collperf/Makefile.in b/icu4c/source/test/collperf/Makefile.in index 90e4c0e020a..138cd9ec225 100644 --- a/icu4c/source/test/collperf/Makefile.in +++ b/icu4c/source/test/collperf/Makefile.in @@ -31,7 +31,6 @@ ifeq ($(ENABLE_RPATH),YES) RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) endif LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) -INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/common:$(top_builddir)/i18n:$(top_builddir)/tools/toolutil:$$$(LDLIBRARYPATH_ENVVAR) LIBS = $(LIBICUI18N) $(LIBICUUC) @LIBS@ @LIB_M@ OBJECTS = collperf.o diff --git a/icu4c/source/test/ieeetest/Makefile.in b/icu4c/source/test/ieeetest/Makefile.in index e5fc5ff4359..c017561000d 100644 --- a/icu4c/source/test/ieeetest/Makefile.in +++ b/icu4c/source/test/ieeetest/Makefile.in @@ -31,7 +31,6 @@ ifeq ($(ENABLE_RPATH),YES) RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) endif LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) -INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/common:$(top_builddir)/data:$$$(LDLIBRARYPATH_ENVVAR) LIBS = $(LIBICUUC) @LIBS@ @LIB_M@ OBJECTS = ieeetest.o diff --git a/icu4c/source/test/intltest/Makefile.in b/icu4c/source/test/intltest/Makefile.in index e86e3426788..94134218eee 100644 --- a/icu4c/source/test/intltest/Makefile.in +++ b/icu4c/source/test/intltest/Makefile.in @@ -33,7 +33,6 @@ ifeq ($(ENABLE_RPATH),YES) RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) endif LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) -INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/common:$(top_builddir)/i18n:$(top_builddir)/tools/toolutil:$(top_builddir)/data:$$$(LDLIBRARYPATH_ENVVAR) LIBS = $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) @LIBS@ @LIB_M@ OBJECTS = allcoll.o apicoll.o callimts.o calregts.o caltest.o \ diff --git a/icu4c/source/test/letest/Makefile.in b/icu4c/source/test/letest/Makefile.in index da99c620a44..401707d86c9 100644 --- a/icu4c/source/test/letest/Makefile.in +++ b/icu4c/source/test/letest/Makefile.in @@ -32,7 +32,6 @@ ifeq ($(ENABLE_RPATH),YES) RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) endif LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) -INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/common:$(top_builddir)/i18n:$(top_builddir)/tools/toolutil:$$$(LDLIBRARYPATH_ENVVAR) LIBS = $(LIBICULE) $(LIBICUUC) @LIBS@ @LIB_M@ COMMONOBJECTS = cmaps.o PortableFontInstance.o diff --git a/icu4c/source/test/testmap/Makefile.in b/icu4c/source/test/testmap/Makefile.in index 6ef539ede0d..22c5476fd38 100644 --- a/icu4c/source/test/testmap/Makefile.in +++ b/icu4c/source/test/testmap/Makefile.in @@ -38,7 +38,6 @@ CFLAGS = @CFLAGS@ CXXFLAGS = @CXXFLAGS@ ENABLE_RPATH = @ENABLE_RPATH@ LDFLAGS = @LDFLAGS@ -INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/common:$(top_builddir)/data:$$$(LDLIBRARYPATH_ENVVAR) LIBS = $(LIBICUUC) @LIBS@ @LIB_M@ $(LIBICUDATA) OBJECTS = testmap.o diff --git a/icu4c/source/test/thaitest/Makefile.in b/icu4c/source/test/thaitest/Makefile.in index d8eec29f9e6..b83d335de78 100644 --- a/icu4c/source/test/thaitest/Makefile.in +++ b/icu4c/source/test/thaitest/Makefile.in @@ -31,7 +31,6 @@ ifeq ($(ENABLE_RPATH),YES) RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) endif LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) -INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/common:$(top_builddir)/i18n:$(top_builddir)/tools/toolutil:$$$(LDLIBRARYPATH_ENVVAR) LIBS = $(LIBICUI18N) $(LIBICUUC) @LIBS@ @LIB_M@ OBJECTS = thaitest.o diff --git a/icu4c/source/tools/ctestfw/Makefile.in b/icu4c/source/tools/ctestfw/Makefile.in index 14661b71e71..d32f5cec354 100644 --- a/icu4c/source/tools/ctestfw/Makefile.in +++ b/icu4c/source/tools/ctestfw/Makefile.in @@ -3,6 +3,9 @@ ## others. All Rights Reserved. ## Stephen F. Booth +SO_TARGET_VERSION = @LIB_VERSION@ +SO_TARGET_VERSION_MAJOR = @LIB_VERSION_MAJOR@ + ## Source directory information srcdir = @srcdir@ top_srcdir = @top_srcdir@ diff --git a/icu4c/source/tools/dumpce/Makefile.in b/icu4c/source/tools/dumpce/Makefile.in index 3695dd23abc..d7b56f55763 100644 --- a/icu4c/source/tools/dumpce/Makefile.in +++ b/icu4c/source/tools/dumpce/Makefile.in @@ -31,7 +31,6 @@ ifeq ($(ENABLE_RPATH),YES) RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) endif LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) -INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/common:$(top_builddir)/i18n:$(top_builddir)/tools/toolutil:$$$(LDLIBRARYPATH_ENVVAR) LIBS = $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) @LIBS@ @LIB_M@ OBJECTS = dumpce.o diff --git a/icu4c/source/tools/gencnval/Makefile.in b/icu4c/source/tools/gencnval/Makefile.in index 06331540660..8267addd5c0 100644 --- a/icu4c/source/tools/gencnval/Makefile.in +++ b/icu4c/source/tools/gencnval/Makefile.in @@ -46,7 +46,6 @@ ifeq ($(ENABLE_RPATH),YES) RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) endif LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) -INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/common:$(top_builddir)/tools/toolutil:$$$(LDLIBRARYPATH_ENVVAR) LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) @LIBS@ @LIB_M@ OBJECTS = gencnval.o diff --git a/icu4c/source/tools/gennames/Makefile.in b/icu4c/source/tools/gennames/Makefile.in index e3fe845c090..f79ab6d4b88 100644 --- a/icu4c/source/tools/gennames/Makefile.in +++ b/icu4c/source/tools/gennames/Makefile.in @@ -37,7 +37,6 @@ ifeq ($(ENABLE_RPATH),YES) RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) endif LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) -INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/common:$(top_builddir)/tools/toolutil:$$$(LDLIBRARYPATH_ENVVAR) LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) @LIBS@ @LIB_M@ OBJECTS = gennames.o diff --git a/icu4c/source/tools/gennorm/Makefile.in b/icu4c/source/tools/gennorm/Makefile.in index f947fb5115a..d0d69bcb540 100644 --- a/icu4c/source/tools/gennorm/Makefile.in +++ b/icu4c/source/tools/gennorm/Makefile.in @@ -37,7 +37,6 @@ ifeq ($(ENABLE_RPATH),YES) RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) endif LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) -INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/common:$(top_builddir)/tools/toolutil:$$$(LDLIBRARYPATH_ENVVAR) LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) @LIBS@ @LIB_M@ OBJECTS = gennorm.o store.o diff --git a/icu4c/source/tools/genprops/Makefile.in b/icu4c/source/tools/genprops/Makefile.in index d0d62053a8b..b8d1c4af70e 100644 --- a/icu4c/source/tools/genprops/Makefile.in +++ b/icu4c/source/tools/genprops/Makefile.in @@ -37,7 +37,6 @@ ifeq ($(ENABLE_RPATH),YES) RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) endif LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) -INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/common:$(top_builddir)/tools/toolutil:$$$(LDLIBRARYPATH_ENVVAR) LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) @LIBS@ @LIB_M@ OBJECTS = genprops.o store.o diff --git a/icu4c/source/tools/gentest/Makefile.in b/icu4c/source/tools/gentest/Makefile.in index dc2d67c8a23..e31905ecbb6 100644 --- a/icu4c/source/tools/gentest/Makefile.in +++ b/icu4c/source/tools/gentest/Makefile.in @@ -37,7 +37,6 @@ ifeq ($(ENABLE_RPATH),YES) RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) endif LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) -INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/common:$(top_builddir)/tools/toolutil:$$$(LDLIBRARYPATH_ENVVAR) LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) @LIBS@ @LIB_M@ OBJECTS = gentest.o diff --git a/icu4c/source/tools/gentz/Makefile.in b/icu4c/source/tools/gentz/Makefile.in index 43e9fdffa03..912f63c8a40 100644 --- a/icu4c/source/tools/gentz/Makefile.in +++ b/icu4c/source/tools/gentz/Makefile.in @@ -37,7 +37,6 @@ ifeq ($(ENABLE_RPATH),YES) RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) endif LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) -INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/common:$(top_builddir)/tools/toolutil:$$$(LDLIBRARYPATH_ENVVAR) LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) @LIBS@ @LIB_M@ OBJECTS = gentz.o diff --git a/icu4c/source/tools/makeconv/Makefile.in b/icu4c/source/tools/makeconv/Makefile.in index 2f72914504b..495016f8801 100644 --- a/icu4c/source/tools/makeconv/Makefile.in +++ b/icu4c/source/tools/makeconv/Makefile.in @@ -51,7 +51,6 @@ ifeq ($(ENABLE_RPATH),YES) RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) endif LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) -INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/common:$(top_builddir)/tools/toolutil:$$$(LDLIBRARYPATH_ENVVAR) LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) @LIBS@ @LIB_M@ OBJECTS = makeconv.o ucnvstat.o genmbcs.o diff --git a/icu4c/source/tools/toolutil/Makefile.in b/icu4c/source/tools/toolutil/Makefile.in index 95b8c6d4536..8507fd7f55d 100644 --- a/icu4c/source/tools/toolutil/Makefile.in +++ b/icu4c/source/tools/toolutil/Makefile.in @@ -4,6 +4,9 @@ ## Makefile.in for ICU - tools/toolutil ## Steven R. Loomis +SO_TARGET_VERSION = @LIB_VERSION@ +SO_TARGET_VERSION_MAJOR = @LIB_VERSION_MAJOR@ + ## Source directory information srcdir = @srcdir@ top_srcdir = @top_srcdir@