From 4f19d0e7af1e6aa4435b954e1b23531c96e0e71e Mon Sep 17 00:00:00 2001 From: Bernd Edlinger Date: Tue, 19 Feb 2019 18:21:26 +0000 Subject: [PATCH] Makefile.am: Avoid the -D option which is not available with the install-sh fallback. 2019-02-19 Bernd Edlinger * src/Makefile.am: Avoid the -D option which is not available with the install-sh fallback. Use $(MKDIR_P) instead. * libdruntime/Makefile.am: Likewise. * src/Makefile.in: Regenerated. * libdruntime/Makefile.in: Regenerated. From-SVN: r269025 --- libphobos/ChangeLog | 8 ++++++++ libphobos/libdruntime/Makefile.am | 5 +++-- libphobos/libdruntime/Makefile.in | 5 +++-- libphobos/src/Makefile.am | 5 +++-- libphobos/src/Makefile.in | 5 +++-- 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/libphobos/ChangeLog b/libphobos/ChangeLog index 16514ff650f..a2ccba0cddb 100644 --- a/libphobos/ChangeLog +++ b/libphobos/ChangeLog @@ -1,3 +1,11 @@ +2019-02-19 Bernd Edlinger + + * src/Makefile.am: Avoid the -D option which is not available + with the install-sh fallback. Use $(MKDIR_P) instead. + * libdruntime/Makefile.am: Likewise. + * src/Makefile.in: Regenerated. + * libdruntime/Makefile.in: Regenerated. + 2019-02-19 Iain Buclaw * testsuite/libphobos.shared/load.d: Import core.sys.posix.dlfcn. diff --git a/libphobos/libdruntime/Makefile.am b/libphobos/libdruntime/Makefile.am index eca6c4a56fd..3085bfb181a 100644 --- a/libphobos/libdruntime/Makefile.am +++ b/libphobos/libdruntime/Makefile.am @@ -147,10 +147,11 @@ clean-local: # Handles generated files as well install-data-local: for file in $(ALL_DRUNTIME_INSTALL_DSOURCES); do \ + $(MKDIR_P) `dirname $(DESTDIR)$(gdc_include_dir)/$$file` ; \ if test -f $$file; then \ - $(INSTALL_HEADER) -D $$file $(DESTDIR)$(gdc_include_dir)/$$file ; \ + $(INSTALL_HEADER) $$file $(DESTDIR)$(gdc_include_dir)/$$file ; \ else \ - $(INSTALL_HEADER) -D $(srcdir)/$$file \ + $(INSTALL_HEADER) $(srcdir)/$$file \ $(DESTDIR)$(gdc_include_dir)/$$file ; \ fi ; \ done diff --git a/libphobos/libdruntime/Makefile.in b/libphobos/libdruntime/Makefile.in index 8f4ff8b1831..509109b9a71 100644 --- a/libphobos/libdruntime/Makefile.in +++ b/libphobos/libdruntime/Makefile.in @@ -2745,10 +2745,11 @@ clean-local: # Handles generated files as well install-data-local: for file in $(ALL_DRUNTIME_INSTALL_DSOURCES); do \ + $(MKDIR_P) `dirname $(DESTDIR)$(gdc_include_dir)/$$file` ; \ if test -f $$file; then \ - $(INSTALL_HEADER) -D $$file $(DESTDIR)$(gdc_include_dir)/$$file ; \ + $(INSTALL_HEADER) $$file $(DESTDIR)$(gdc_include_dir)/$$file ; \ else \ - $(INSTALL_HEADER) -D $(srcdir)/$$file \ + $(INSTALL_HEADER) $(srcdir)/$$file \ $(DESTDIR)$(gdc_include_dir)/$$file ; \ fi ; \ done diff --git a/libphobos/src/Makefile.am b/libphobos/src/Makefile.am index 51fd11e5c6c..c5d8a31d90d 100644 --- a/libphobos/src/Makefile.am +++ b/libphobos/src/Makefile.am @@ -94,10 +94,11 @@ clean-local: # Handles generated files as well install-data-local: for file in $(ALL_PHOBOS_INSTALL_DSOURCES); do \ + $(MKDIR_P) `dirname $(DESTDIR)$(gdc_include_dir)/$$file` ; \ if test -f $$file; then \ - $(INSTALL_HEADER) -D $$file $(DESTDIR)$(gdc_include_dir)/$$file ; \ + $(INSTALL_HEADER) $$file $(DESTDIR)$(gdc_include_dir)/$$file ; \ else \ - $(INSTALL_HEADER) -D $(srcdir)/$$file \ + $(INSTALL_HEADER) $(srcdir)/$$file \ $(DESTDIR)$(gdc_include_dir)/$$file ; \ fi ; \ done diff --git a/libphobos/src/Makefile.in b/libphobos/src/Makefile.in index b6037ac0ff0..1f8889fe90c 100644 --- a/libphobos/src/Makefile.in +++ b/libphobos/src/Makefile.in @@ -1650,10 +1650,11 @@ clean-local: # Handles generated files as well install-data-local: for file in $(ALL_PHOBOS_INSTALL_DSOURCES); do \ + $(MKDIR_P) `dirname $(DESTDIR)$(gdc_include_dir)/$$file` ; \ if test -f $$file; then \ - $(INSTALL_HEADER) -D $$file $(DESTDIR)$(gdc_include_dir)/$$file ; \ + $(INSTALL_HEADER) $$file $(DESTDIR)$(gdc_include_dir)/$$file ; \ else \ - $(INSTALL_HEADER) -D $(srcdir)/$$file \ + $(INSTALL_HEADER) $(srcdir)/$$file \ $(DESTDIR)$(gdc_include_dir)/$$file ; \ fi ; \ done