31 lines
774 B
Plaintext
31 lines
774 B
Plaintext
$NetBSD: patch-ad,v 1.13 2013/10/19 08:47:36 adam Exp $
|
|
|
|
--- icudefs.mk.in.orig 2013-10-04 20:54:58.000000000 +0000
|
|
+++ icudefs.mk.in
|
|
@@ -207,13 +207,13 @@ LIBICU = $(LIBPREFIX)$(ICUPREFIX)
|
|
|
|
## If we can't use the shared libraries, use the static libraries
|
|
ifneq ($(ENABLE_SHARED),YES)
|
|
-STATIC_PREFIX_WHEN_USED = s
|
|
+STATIC_PREFIX_WHEN_USED =
|
|
else
|
|
STATIC_PREFIX_WHEN_USED =
|
|
endif
|
|
|
|
# Static library prefix and file extension
|
|
-STATIC_PREFIX = s
|
|
+STATIC_PREFIX =
|
|
LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX)
|
|
A = a
|
|
SOBJ = $(SO)
|
|
@@ -311,5 +311,9 @@ ifneq ($(TEST_STATUS_FILE),)
|
|
TEST_OUTPUT_OPTS="-E$(TEST_STATUS_FILE)"
|
|
endif
|
|
|
|
+ifeq ($(DSO_LIBDIR),)
|
|
+DSO_LIBDIR= $(DESTDIR)$(libdir)
|
|
+endif
|
|
+
|
|
# optional include at top
|
|
-include $(top_builddir)/icudefs.local
|