2007-10-06 01:45:46 +02:00
|
|
|
--- builds/posix/make.defaults.orig 2007-09-04 15:51:17.000000000 +0800
|
|
|
|
|
+++ builds/posix/make.defaults 2007-10-05 07:05:13.947441166 +0800
|
|
|
|
|
@@ -107,7 +107,7 @@
|
2006-03-17 11:23:32 +01:00
|
|
|
CHMOD= chmod
|
|
|
|
|
CHMOD_6= chmod 666
|
|
|
|
|
CHMOD_7= chmod 777
|
|
|
|
|
-CHMOD_S7= chmod 06777
|
|
|
|
|
+CHMOD_S7= chmod 04555
|
|
|
|
|
MV= mv -f
|
|
|
|
|
TOUCH= touch
|
|
|
|
|
CP= cp
|
2007-10-06 01:45:46 +02:00
|
|
|
@@ -185,9 +185,6 @@
|
2006-09-18 17:20:04 +02:00
|
|
|
|
|
|
|
|
LIBFBSTATIC_A = $(LIB)/libfbstatic.a
|
|
|
|
|
LIBEDITLINE_A = $(LIB)/libeditline.a
|
|
|
|
|
-LIBICU_SO = $(LIB)/$(LIB_PREFIX)icuuc.$(SHRLIB_EXT) \
|
|
|
|
|
- $(LIB)/$(LIB_PREFIX)icudata.$(SHRLIB_EXT) \
|
|
|
|
|
- $(LIB)/$(LIB_PREFIX)icui18n.$(SHRLIB_EXT)
|
|
|
|
|
|
|
|
|
|
# Shared library name for usage inside of the UDF
|
|
|
|
|
IbUtilLibraryName = $(LIB_PREFIX)ib_util.$(SHRLIB_EXT)
|
2007-10-06 01:45:46 +02:00
|
|
|
@@ -203,7 +200,7 @@
|
|
|
|
|
STATICEXE_LINK:= @CXX@
|
|
|
|
|
|
|
|
|
|
LINK_LIBS = @LIBS@ @EDITLINE_A@
|
|
|
|
|
-ICU_LIBS = -licuuc -licudata -licui18n
|
|
|
|
|
+ICU_LIBS = @ICU_LIBS@ @ICU_LDFLAGS@
|
|
|
|
|
STATICLINK_LIBS = @LIBS@ @EDITLINE_A@
|
|
|
|
|
SO_LINK_LIBS = @LIBS@
|
|
|
|
|
|
