diff options
Diffstat (limited to 'Build/source/libs/icu')
-rw-r--r-- | Build/source/libs/icu/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/libs/icu/Makefile.am | 4 | ||||
-rw-r--r-- | Build/source/libs/icu/Makefile.in | 29 | ||||
-rw-r--r-- | Build/source/libs/icu/aclocal.m4 | 6 | ||||
-rw-r--r-- | Build/source/libs/icu/include/Makefile.in | 8 | ||||
-rw-r--r-- | Build/source/libs/icu/include/layout/Makefile.in | 4 | ||||
-rw-r--r-- | Build/source/libs/icu/include/unicode/Makefile.in | 4 |
7 files changed, 31 insertions, 28 deletions
diff --git a/Build/source/libs/icu/ChangeLog b/Build/source/libs/icu/ChangeLog index 9811b53134a..2dd57fca383 100644 --- a/Build/source/libs/icu/ChangeLog +++ b/Build/source/libs/icu/ChangeLog @@ -1,3 +1,7 @@ +2009-12-12 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Replace the obsolete $(mkdir_p) by $(MKDIR_P). + 2009-10-25 Peter Breitenlohner <peb@mppmu.mpg.de> Adapted to the ICU 4.2.1 distribution. diff --git a/Build/source/libs/icu/Makefile.am b/Build/source/libs/icu/Makefile.am index e52e08094e1..b88647db9a1 100644 --- a/Build/source/libs/icu/Makefile.am +++ b/Build/source/libs/icu/Makefile.am @@ -40,7 +40,7 @@ ICU_NATIVE = icu-native/config/icucross.mk endif cross icu-build/Makefile: $(ICU_NATIVE) - $(mkdir_p) icu-build + $(MKDIR_P) icu-build @cmd="$(icu_config) $(icu_build_args)"; \ (cd icu-build && echo "=== configuring in icu-build (`pwd`)" && \ echo "make: running $(SHELL) $$cmd" && \ @@ -51,7 +51,7 @@ icu-native/config/icucross.mk: icu-native/Makefile cd icu-native && $(MAKE) $(AM_MAKEFLAGS) config/icucross.mk icu-native/Makefile: - $(mkdir_p) icu-native + $(MKDIR_P) icu-native @cmd="$(icu_config) $(icu_native_args)"; \ (cd icu-native && echo "=== configuring in icu-native (`pwd`)" && \ echo "make: running $(SHELL) $$cmd" && \ diff --git a/Build/source/libs/icu/Makefile.in b/Build/source/libs/icu/Makefile.in index 42c03ee6c4c..46119ee7146 100644 --- a/Build/source/libs/icu/Makefile.in +++ b/Build/source/libs/icu/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -39,14 +39,12 @@ DIST_COMMON = README $(am__configure_deps) \ $(srcdir)/../../build-aux/config.guess \ $(srcdir)/../../build-aux/config.sub \ $(srcdir)/../../build-aux/install-sh \ - $(srcdir)/../../build-aux/missing \ - $(srcdir)/../../build-aux/mkinstalldirs $(srcdir)/Makefile.am \ + $(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(top_srcdir)/configure \ ../../build-aux/config.guess ../../build-aux/config.sub \ ../../build-aux/depcomp ../../build-aux/install-sh \ ../../build-aux/ltmain.sh ../../build-aux/missing \ - ../../build-aux/mkinstalldirs ../../build-aux/texinfo.tex \ - ../../build-aux/ylwrap ChangeLog + ../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/configure.ac @@ -54,7 +52,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno -mkinstalldirs = $(SHELL) $(top_srcdir)/../../build-aux/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = SOURCES = @@ -245,7 +243,7 @@ $(am__aclocal_m4_deps): # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -270,7 +268,7 @@ $(RECURSIVE_TARGETS): fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -437,7 +435,8 @@ distdir: $(DISTFILES) top_distdir="$(top_distdir)" distdir="$(distdir)" \ dist-hook -test -n "$(am__skip_mode_fix)" \ - || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + || find "$(distdir)" -type d ! -perm -755 \ + -exec chmod u+rwx,go+rx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ @@ -481,17 +480,17 @@ dist dist-all: distdir distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ + lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac @@ -683,7 +682,7 @@ dist-hook: @build_FALSE@all-local: icu-build/Makefile icu-build/Makefile: $(ICU_NATIVE) - $(mkdir_p) icu-build + $(MKDIR_P) icu-build @cmd="$(icu_config) $(icu_build_args)"; \ (cd icu-build && echo "=== configuring in icu-build (`pwd`)" && \ echo "make: running $(SHELL) $$cmd" && \ @@ -694,7 +693,7 @@ icu-native/config/icucross.mk: icu-native/Makefile cd icu-native && $(MAKE) $(AM_MAKEFLAGS) config/icucross.mk icu-native/Makefile: - $(mkdir_p) icu-native + $(MKDIR_P) icu-native @cmd="$(icu_config) $(icu_native_args)"; \ (cd icu-native && echo "=== configuring in icu-native (`pwd`)" && \ echo "make: running $(SHELL) $$cmd" && \ diff --git a/Build/source/libs/icu/aclocal.m4 b/Build/source/libs/icu/aclocal.m4 index c4b112c58f8..542affb893a 100644 --- a/Build/source/libs/icu/aclocal.m4 +++ b/Build/source/libs/icu/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. @@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11], [], +m4_if([$1], [1.11.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11])dnl +[AM_AUTOMAKE_VERSION([1.11.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff --git a/Build/source/libs/icu/include/Makefile.in b/Build/source/libs/icu/include/Makefile.in index 79fa9518f69..5dde1d543a3 100644 --- a/Build/source/libs/icu/include/Makefile.in +++ b/Build/source/libs/icu/include/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/../../build-aux/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = SOURCES = @@ -222,7 +222,7 @@ $(am__aclocal_m4_deps): # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -247,7 +247,7 @@ $(RECURSIVE_TARGETS): fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ diff --git a/Build/source/libs/icu/include/layout/Makefile.in b/Build/source/libs/icu/include/layout/Makefile.in index f796e9b41b6..7db7c85ce49 100644 --- a/Build/source/libs/icu/include/layout/Makefile.in +++ b/Build/source/libs/icu/include/layout/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/../../build-aux/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = SOURCES = diff --git a/Build/source/libs/icu/include/unicode/Makefile.in b/Build/source/libs/icu/include/unicode/Makefile.in index a0fe6f9c79a..bddfa227dd2 100644 --- a/Build/source/libs/icu/include/unicode/Makefile.in +++ b/Build/source/libs/icu/include/unicode/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/../../build-aux/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = SOURCES = |