mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-22 18:43:02 +01:00
More appropriate place to configure ICU
This commit is contained in:
parent
54340234e1
commit
93da790005
@ -33,10 +33,9 @@ include $(ROOT)/gen/make.shared.variables
|
|||||||
.PHONY: libicu
|
.PHONY: libicu
|
||||||
|
|
||||||
|
|
||||||
libicu: $(LIB)/libicuuc.so $(LIB)/libicudata.so $(LIB)/libicui18n.so
|
libicu: $(LIB)/libicuuc.$(SHRLIB_EXT) $(LIB)/libicudata.$(SHRLIB_EXT) $(LIB)/libicui18n.$(SHRLIB_EXT)
|
||||||
|
|
||||||
$(LIB)/libicuuc.so $(LIB)/libicudata.so $(LIB)/libicui18n.so:
|
$(LIB)/libicuuc.$(SHRLIB_EXT) $(LIB)/libicudata.$(SHRLIB_EXT) $(LIB)/libicui18n.$(SHRLIB_EXT):
|
||||||
cd $(ROOT)/extern/icu/source; chmod +x runConfigureICU configure install-sh; ./runConfigureICU @ICU_PLATFORM@ --prefix=`pwd`/..
|
|
||||||
$(MAKE) -C $(ROOT)/extern/icu/source
|
$(MAKE) -C $(ROOT)/extern/icu/source
|
||||||
$(MAKE) -C $(ROOT)/extern/icu/source install
|
$(MAKE) -C $(ROOT)/extern/icu/source install
|
||||||
cp $(ROOT)/extern/icu/lib/libicuuc* $(LIB)
|
cp $(ROOT)/extern/icu/lib/libicuuc* $(LIB)
|
||||||
|
@ -157,6 +157,7 @@ case "$target" in
|
|||||||
EDITLINE_FLG=N
|
EDITLINE_FLG=N
|
||||||
RAW_DEVICES_FLG=N
|
RAW_DEVICES_FLG=N
|
||||||
SHRLIB_EXT=dll
|
SHRLIB_EXT=dll
|
||||||
|
ICU_PLATFORM=Cygwin
|
||||||
;;
|
;;
|
||||||
|
|
||||||
*)
|
*)
|
||||||
@ -986,6 +987,10 @@ gen/Makefile.extern.icu:${MAKE_SRC_DIR}/Makefile.in.extern.icu
|
|||||||
)
|
)
|
||||||
AC_OUTPUT
|
AC_OUTPUT
|
||||||
|
|
||||||
|
(cd extern/icu/source
|
||||||
|
chmod +x runConfigureICU configure install-sh
|
||||||
|
./runConfigureICU "$ICU_PLATFORM" --prefix=`pwd`/..)
|
||||||
|
|
||||||
dnl Print out the build configuration (the most interesting thing)
|
dnl Print out the build configuration (the most interesting thing)
|
||||||
echo
|
echo
|
||||||
echo
|
echo
|
||||||
|
Loading…
Reference in New Issue
Block a user