Makefile.am: Avoid the -D option which is not available with the install-sh fallback.

2019-02-19  Bernd Edlinger  <bernd.edlinger@hotmail.de>

        * 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

diff --git a/libphobos/ChangeLog b/libphobos/ChangeLog
index 16514ff650f6d2d353e4a1a554c08b641ca0ddb2..a2ccba0cddbfa8fd1fa146e0bf7701e700c67c45 100644 (file)
--- a/libphobos/ChangeLog
+++ b/libphobos/ChangeLog
@@ -1,3 +1,11 @@
+2019-02-19  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+       * 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  <ibuclaw@gdcproject.org>
 
        * testsuite/libphobos.shared/load.d: Import core.sys.posix.dlfcn.

diff --git a/libphobos/libdruntime/Makefile.am b/libphobos/libdruntime/Makefile.am
index eca6c4a56fd3db7603a03f4e2b0a3c24b2d2bc9c..3085bfb181a49ad06bf85c563ee669dec9f78bef 100644 (file)
--- 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 8f4ff8b1831694ffc854730a21dbec0691d0cac4..509109b9a71c801651b6b2bfc26c148604accc88 100644 (file)
--- 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 51fd11e5c6cde6192719adde044d4c8310f30153..c5d8a31d90da8a70e642b0fa42d890c7461c65cc 100644 (file)
--- 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 b6037ac0ff0e58567a1b1b8a6c357135db4a8916..1f8889fe90c6a8a41323ef821be7e383da3c0c14 100644 (file)
--- 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