From f3741c270182a282b7bc1088fc0c5e25ebc1d44f Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Thu, 29 Aug 2002 00:22:10 +0000 Subject: [PATCH] 2002-08-28 Jeff Johnston * Makefile.am (install-data-local): Move install of build newlib.h after installing headers in libc/include so as to overwrite default newlib.h. * Makefile.in: Regenerated. --- newlib/ChangeLog | 7 +++++++ newlib/Makefile.am | 2 +- newlib/Makefile.in | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/newlib/ChangeLog b/newlib/ChangeLog index fcc63f810..29870abbc 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,10 @@ +2002-08-28 Jeff Johnston + + * Makefile.am (install-data-local): Move install of build + newlib.h after installing headers in libc/include so as to + overwrite default newlib.h. + * Makefile.in: Regenerated. + 2002-08-28 Jeff Johnston * libc/include/newlib.h: New file for tools that use newlib diff --git a/newlib/Makefile.am b/newlib/Makefile.am index 801a90e97..7afb28a75 100644 --- a/newlib/Makefile.am +++ b/newlib/Makefile.am @@ -228,10 +228,10 @@ endif $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do -if [ -z "$(MULTISUBDIR)" ]; then \ $(mkinstalldirs) $(DESTDIR)$(tooldir)/include; \ - $(INSTALL_DATA) newlib.h $(DESTDIR)$(tooldir)/include/newlib.h; \ for i in $(srcdir)/libc/include/*.h; do \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \ done; \ + $(INSTALL_DATA) newlib.h $(DESTDIR)$(tooldir)/include/newlib.h; \ $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/machine; \ for i in $(srcdir)/libc/include/machine/*.h; do \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \ diff --git a/newlib/Makefile.in b/newlib/Makefile.in index 2febe73f5..a58444bf0 100644 --- a/newlib/Makefile.in +++ b/newlib/Makefile.in @@ -798,10 +798,10 @@ install-data-local: install-toollibLIBRARIES $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do -if [ -z "$(MULTISUBDIR)" ]; then \ $(mkinstalldirs) $(DESTDIR)$(tooldir)/include; \ - $(INSTALL_DATA) newlib.h $(DESTDIR)$(tooldir)/include/newlib.h; \ for i in $(srcdir)/libc/include/*.h; do \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \ done; \ + $(INSTALL_DATA) newlib.h $(DESTDIR)$(tooldir)/include/newlib.h; \ $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/machine; \ for i in $(srcdir)/libc/include/machine/*.h; do \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \