From 64ce31b952b9c09c09f84b68d398f0bf44d937b2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 11 Feb 2019 18:00:38 +0000 Subject: oops, missed variable name git-svn-id: svn://tug.org/texlive/trunk@50000 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/icu/Makefile.am | 2 +- Build/source/libs/icu/Makefile.in | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'Build/source/libs') diff --git a/Build/source/libs/icu/Makefile.am b/Build/source/libs/icu/Makefile.am index 5947e703a70..63e061523f4 100644 --- a/Build/source/libs/icu/Makefile.am +++ b/Build/source/libs/icu/Makefile.am @@ -88,7 +88,7 @@ LDADD = icu-build/lib/libicuuc.a if cross LDADD += icu-build/lib/libicuuc.a else -icu-build/lib/libicudata.a +LDADD += icu-build/lib/libicudata.a endif LDADD += $(ICU_LIBS_EXTRA) diff --git a/Build/source/libs/icu/Makefile.in b/Build/source/libs/icu/Makefile.in index 69488358540..7570b3a6ede 100644 --- a/Build/source/libs/icu/Makefile.in +++ b/Build/source/libs/icu/Makefile.in @@ -90,6 +90,7 @@ host_triplet = @host@ @build_TRUE@am__append_1 = include/unicode @build_TRUE@check_PROGRAMS = icutest$(EXEEXT) @cross_TRUE@am__append_2 = icu-build/lib/libicuuc.a +@cross_FALSE@am__append_3 = icu-build/lib/libicudata.a subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ @@ -108,7 +109,8 @@ CONFIG_CLEAN_VPATH_FILES = am_icutest_OBJECTS = icutest-icutest.$(OBJEXT) icutest_OBJECTS = $(am_icutest_OBJECTS) icutest_LDADD = $(LDADD) -icutest_DEPENDENCIES = icu-build/lib/libicuuc.a $(am__append_2) +icutest_DEPENDENCIES = icu-build/lib/libicuuc.a $(am__append_2) \ + $(am__append_3) am__dist_check_SCRIPTS_DIST = icu.test AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -579,7 +581,8 @@ icutest_SOURCES = icutest.c # Force Automake to use CXXLD for linking nodist_EXTRA_icutest_SOURCES = dummy.cxx icutest_CPPFLAGS = -Iinclude -LDADD = icu-build/lib/libicuuc.a $(am__append_2) $(ICU_LIBS_EXTRA) +LDADD = icu-build/lib/libicuuc.a $(am__append_2) $(am__append_3) \ + $(ICU_LIBS_EXTRA) # Rebuild rebuild_prereq = @@ -1343,7 +1346,6 @@ check-makeflags: distclean-local: rm -rf icu-build icu-native -@cross_FALSE@icu-build/lib/libicudata.a rebuild.stamp: $(rebuild_target) echo timestamp >$@ -- cgit v1.2.3