From adbbb0348ccebe74a0dbb93307a6d3f96b757fc0 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Wed, 13 Dec 2000 19:32:45 +0000 Subject: [PATCH] 2000-12-13 Jeff Johnston * Makefile.am: Fixed install-data-local target to use $(mkinstalldirs) for the installed header files to ensure the directories exist before copying. * Makefile.in: Regenerated. --- newlib/ChangeLog | 7 +++++++ newlib/Makefile.am | 3 +++ newlib/Makefile.in | 3 +++ 3 files changed, 13 insertions(+) diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 4a3a54b15..c7420c816 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,10 @@ +2000-12-13 Jeff Johnston + + * Makefile.am: Fixed install-data-local target to use + $(mkinstalldirs) for the installed header files to ensure + the directories exist before copying. + * Makefile.in: Regenerated. + 2000-12-12 Jeff Johnston * libc/include/sys/unistd.h: Restored Cygwin _SC diff --git a/newlib/Makefile.am b/newlib/Makefile.am index b78fd59c6..5e7c0fcd4 100644 --- a/newlib/Makefile.am +++ b/newlib/Makefile.am @@ -131,9 +131,11 @@ install-data-local: install-toollibLIBRARIES ln $(DESTDIR)$(toollibdir)/libc.a $(DESTDIR)$(toollibdir)/libg.a $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do -if [ -z "$(MULTISUBDIR)" ]; then \ + $(mkinstalldirs) $(DESTDIR)$(tooldir)/include; \ for i in $(srcdir)/libc/include/*.h; do \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \ done; \ + $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/machine; \ for i in $(srcdir)/libc/include/machine/*.h; do \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \ done; \ @@ -142,6 +144,7 @@ install-data-local: install-toollibLIBRARIES $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \ else true; fi ; \ done; \ + $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/sys; \ for i in $(srcdir)/libc/include/sys/*.h; do \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \ done; \ diff --git a/newlib/Makefile.in b/newlib/Makefile.in index db16a1f8a..2ed1c5b7e 100644 --- a/newlib/Makefile.in +++ b/newlib/Makefile.in @@ -564,9 +564,11 @@ install-data-local: install-toollibLIBRARIES ln $(DESTDIR)$(toollibdir)/libc.a $(DESTDIR)$(toollibdir)/libg.a $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do -if [ -z "$(MULTISUBDIR)" ]; then \ + $(mkinstalldirs) $(DESTDIR)$(tooldir)/include; \ for i in $(srcdir)/libc/include/*.h; do \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \ done; \ + $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/machine; \ for i in $(srcdir)/libc/include/machine/*.h; do \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \ done; \ @@ -575,6 +577,7 @@ install-data-local: install-toollibLIBRARIES $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \ else true; fi ; \ done; \ + $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/sys; \ for i in $(srcdir)/libc/include/sys/*.h; do \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \ done; \