| Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame] | 1 | The generic recursive target calls target-local so also adding it to the |
| 2 | dependency list results in races due to install-local being executed twice in |
| 3 | parallel. For example, install-manx can fail if the two install processes race |
| 4 | and one process tries to chown a file that the other process has just deleted. |
| 5 | |
| 6 | Also install-manx should be a phony target, and for clarity use $^ instead of $? |
| 7 | in the install command. |
| 8 | |
| 9 | Upstream-Status: Pending |
| 10 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 11 | |
| 12 | |
| 13 | diff --git a/Makefile.in b/Makefile.in |
| 14 | index 9db6c52..3441afa 100644 |
| 15 | --- a/Makefile.in |
| 16 | +++ b/Makefile.in |
| 17 | @@ -71,7 +71,7 @@ EXTRA_DATA = |
| 18 | |
| 19 | ## List of phony targets |
| 20 | .PHONY : all all-local all-recursive install install-local install-udata install-udata-files install-udata-dlls \ |
| 21 | -install-recursive clean clean-local clean-recursive distclean \ |
| 22 | +install-recursive install-manx clean clean-local clean-recursive distclean \ |
| 23 | distclean-local distclean-recursive doc dist dist-local dist-recursive \ |
| 24 | check check-local check-recursive clean-recursive-with-twist install-icu \ |
| 25 | doc install-doc tests icu4j-data icu4j-data-install update-windows-makefiles xcheck-local xcheck-recursive xperf xcheck xperf-recursive \ |
| 26 | @@ -82,10 +82,10 @@ check-exhaustive check-exhaustive-local check-exhaustive-recursive releaseDist |
| 27 | |
| 28 | ## List of standard targets |
| 29 | all: all-local all-recursive |
| 30 | -install: install-recursive install-local |
| 31 | +install: install-recursive |
| 32 | clean: clean-recursive-with-twist clean-local |
| 33 | -distclean : distclean-recursive distclean-local |
| 34 | -dist: dist-recursive dist-local |
| 35 | +distclean : distclean-recursive |
| 36 | +dist: dist-recursive |
| 37 | check: all check-recursive |
| 38 | check-recursive: all |
| 39 | xcheck: all xcheck-recursive |
| 40 | @@ -352,7 +352,7 @@ config.status: $(srcdir)/configure $(srcdir)/common/unicode/uvernum.h |
| 41 | |
| 42 | install-manx: $(MANX_FILES) |
| 43 | $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) |
| 44 | - $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION) |
| 45 | + $(INSTALL_DATA) $^ $(DESTDIR)$(mandir)/man$(SECTION) |
| 46 | |
| 47 | config/%.$(SECTION): $(srcdir)/config/%.$(SECTION).in |
| 48 | cd $(top_builddir) \ |