Fix yet another parallel build issue for gnome-user-docs. This one seems to be caused by the following scenario: * install-data-local depends on both install-doc-docs and install-doc-pdf. * both these targets create their output subdirectories using mkinstalldirs. * install-sh seems to have provisions for concurrent execution, but only when installing files, not when invoked to create directories. The patch addresses the issue by having install-doc-pdf not create any directories itself, but depend on install-doc-docs to do that. As an alternative, it might be possible to drop the explicit directory creation altogether, and rely on the implicit and concurrency-aware directory creation of install-sh. The patch below is closer to original behaviour, and thus may be more portable, even in cases where install-sh would not be concurrency-aware. 2009-03-06 Martin von Gagern Reference: https://bugs.gentoo.org/260827 Index: gnome-user-docs-2.24.2/gnome2-accessibility-guide/Makefile.am =================================================================== --- gnome-user-docs-2.24.2.orig/gnome2-accessibility-guide/Makefile.am +++ gnome-user-docs-2.24.2/gnome2-accessibility-guide/Makefile.am @@ -15,12 +15,11 @@ DOC_ENTITIES = \ DOC_LINGUAS = de el en_GB es fi fr hu it oc pt sv install-data-local: install-doc-pdf -install-doc-pdf: +install-doc-pdf: install-doc-docs for lc in C $(DOC_LINGUAS); do \ pdf="$$lc/$(DOC_MODULE).pdf"; \ if [ -f "$$pdf" ]; then spdf="$$pdf"; else spdf="$(srcdir)/$$pdf"; fi; \ if [ -f "$$spdf" ]; then \ - $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc"; \ $(INSTALL_DATA) "$$spdf" "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$pdf"; \ fi; \ done Index: gnome-user-docs-2.24.2/gnome2-accessibility-guide/Makefile.in =================================================================== --- gnome-user-docs-2.24.2.orig/gnome2-accessibility-guide/Makefile.in +++ gnome-user-docs-2.24.2/gnome2-accessibility-guide/Makefile.in @@ -777,12 +777,11 @@ uninstall-doc-omf: dist-hook: doc-dist-hook install-data-local: install-doc-pdf -install-doc-pdf: +install-doc-pdf: install-doc-docs for lc in C $(DOC_LINGUAS); do \ pdf="$$lc/$(DOC_MODULE).pdf"; \ if [ -f "$$pdf" ]; then spdf="$$pdf"; else spdf="$(srcdir)/$$pdf"; fi; \ if [ -f "$$spdf" ]; then \ - $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc"; \ $(INSTALL_DATA) "$$spdf" "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$pdf"; \ fi; \ done Index: gnome-user-docs-2.24.2/gnome2-system-admin-guide/Makefile.am =================================================================== --- gnome-user-docs-2.24.2.orig/gnome2-system-admin-guide/Makefile.am +++ gnome-user-docs-2.24.2/gnome2-system-admin-guide/Makefile.am @@ -21,12 +21,11 @@ DOC_ENTITIES = \ DOC_LINGUAS = ca de el es fi fr it ja ko oc pa pt sv zh_CN install-data-local: install-doc-pdf -install-doc-pdf: +install-doc-pdf: install-doc-docs for lc in C $(DOC_LINGUAS); do \ pdf="$$lc/$(DOC_MODULE).pdf"; \ if [ -f "$$pdf" ]; then spdf="$$pdf"; else spdf="$(srcdir)/$$pdf"; fi; \ if [ -f "$$spdf" ]; then \ - $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc"; \ $(INSTALL_DATA) "$$spdf" "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$pdf"; \ fi; \ done Index: gnome-user-docs-2.24.2/gnome2-system-admin-guide/Makefile.in =================================================================== --- gnome-user-docs-2.24.2.orig/gnome2-system-admin-guide/Makefile.in +++ gnome-user-docs-2.24.2/gnome2-system-admin-guide/Makefile.in @@ -783,12 +783,11 @@ uninstall-doc-omf: dist-hook: doc-dist-hook install-data-local: install-doc-pdf -install-doc-pdf: +install-doc-pdf: install-doc-docs for lc in C $(DOC_LINGUAS); do \ pdf="$$lc/$(DOC_MODULE).pdf"; \ if [ -f "$$pdf" ]; then spdf="$$pdf"; else spdf="$(srcdir)/$$pdf"; fi; \ if [ -f "$$spdf" ]; then \ - $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc"; \ $(INSTALL_DATA) "$$spdf" "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$pdf"; \ fi; \ done Index: gnome-user-docs-2.24.2/gnome2-user-guide/Makefile.am =================================================================== --- gnome-user-docs-2.24.2.orig/gnome2-user-guide/Makefile.am +++ gnome-user-docs-2.24.2/gnome2-user-guide/Makefile.am @@ -18,12 +18,11 @@ DOC_INCLUDES = \ DOC_LINGUAS = ar bg de el es fi fr hu it ja ko oc pa pt pt_BR ru sv th zh_CN install-data-local: install-doc-pdf -install-doc-pdf: +install-doc-pdf: install-doc-docs for lc in C $(DOC_LINGUAS); do \ pdf="$$lc/$(DOC_MODULE).pdf"; \ if [ -f "$$pdf" ]; then spdf="$$pdf"; else spdf="$(srcdir)/$$pdf"; fi; \ if [ -f "$$spdf" ]; then \ - $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc"; \ $(INSTALL_DATA) "$$spdf" "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$pdf"; \ fi; \ done Index: gnome-user-docs-2.24.2/gnome2-user-guide/Makefile.in =================================================================== --- gnome-user-docs-2.24.2.orig/gnome2-user-guide/Makefile.in +++ gnome-user-docs-2.24.2/gnome2-user-guide/Makefile.in @@ -780,12 +780,11 @@ uninstall-doc-omf: dist-hook: doc-dist-hook install-data-local: install-doc-pdf -install-doc-pdf: +install-doc-pdf: install-doc-docs for lc in C $(DOC_LINGUAS); do \ pdf="$$lc/$(DOC_MODULE).pdf"; \ if [ -f "$$pdf" ]; then spdf="$$pdf"; else spdf="$(srcdir)/$$pdf"; fi; \ if [ -f "$$spdf" ]; then \ - $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc"; \ $(INSTALL_DATA) "$$spdf" "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$pdf"; \ fi; \ done