From db933bb29cef3a1de2ec523fd0f9d0388157fc95 Mon Sep 17 00:00:00 2001 From: "mkaply%us.ibm.com" Date: Mon, 2 Jul 2001 13:02:41 +0000 Subject: [PATCH] OS/2 only - much better version of this Makefile that fixes EMX bustage --- intl/locale/src/os2/Makefile.in | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/intl/locale/src/os2/Makefile.in b/intl/locale/src/os2/Makefile.in index 76cc314ea804..eb665f24b157 100644 --- a/intl/locale/src/os2/Makefile.in +++ b/intl/locale/src/os2/Makefile.in @@ -17,7 +17,7 @@ # DEPTH = ../../../.. -topsrcdir = @top_srcdir@ +topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -40,19 +40,20 @@ CPPSRCS = \ nsLocaleModule.cpp \ $(NULL) +EXTRA_DSO_LIBS = nslocale_s + EXTRA_DSO_LDOPTS += \ $(MOZ_COMPONENT_LIBS) \ + $(EXTRA_DSO_LIBS) \ $(NULL) ifeq ($(MOZ_OS2_TOOLS),VACPP) -EXTRA_DSO_LDOPTS += libuls.lib -SHARED_LIBRARY_LIBS += ../libnslocale_s.lib +OS_LIBS += libuls.lib else -SHARED_LIBRARY_LIBS += -llibuni -L.. -lnslocale_s +OS_LIBS += -llibuni endif include $(topsrcdir)/config/rules.mk INCLUDES += -I$(srcdir)/.. -