From 07467d31def1f9c3870a3b0ae6c8756b6244ac41 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Fri, 15 Dec 2000 00:55:02 +0000 Subject: [PATCH] Makefile.am (myinstallheaders): Install backwards headers in prefix, not prefix/backward. 2000-12-14 Benjamin Kosnik * src/Makefile.am (myinstallheaders): Install backwards headers in prefix, not prefix/backward. * src/Makefile.in: Regenerate. From-SVN: r38265 --- libstdc++-v3/ChangeLog | 8 +++++++- libstdc++-v3/config.h.in | 9 --------- libstdc++-v3/src/Makefile.am | 7 +++---- libstdc++-v3/src/Makefile.in | 5 ++--- 4 files changed, 12 insertions(+), 17 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 1c7a054..a2a4268 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2000-12-14 Benjamin Kosnik + + * src/Makefile.am (myinstallheaders): Install backwards headers in + prefix, not prefix/backward. + * src/Makefile.in: Regenerate. + 2000-12-14 Benjamin Kosnik * acinclude.m4 (GLIBCPP_CHECK_MATH_SUPPORT): Revert changes @@ -12,7 +18,7 @@ * mknumeric_limits (CXX): Use BUILD_DIR/g++, not g++ in path. Consistency with tests_flags.in. -2000-12-14 Benjamin Kosnik +2000-12-14 Benjamin Kosnik * include/c/bits/*.h: Remove include_next, replace with include, as include_next does not work host-x-host, and include_next not diff --git a/libstdc++-v3/config.h.in b/libstdc++-v3/config.h.in index ce72a7e..5f32f43 100644 --- a/libstdc++-v3/config.h.in +++ b/libstdc++-v3/config.h.in @@ -87,9 +87,6 @@ /* Define if you have the _asinl function. */ #undef HAVE__ASINL -/* Define if you have the _atan2f function. */ -#undef HAVE__ATAN2F - /* Define if you have the _atan2l function. */ #undef HAVE__ATAN2L @@ -108,9 +105,6 @@ /* Define if you have the _copysign function. */ #undef HAVE__COPYSIGN -/* Define if you have the _copysignf function. */ -#undef HAVE__COPYSIGNF - /* Define if you have the _copysignl function. */ #undef HAVE__COPYSIGNL @@ -126,9 +120,6 @@ /* Define if you have the _cosl function. */ #undef HAVE__COSL -/* Define if you have the _expf function. */ -#undef HAVE__EXPF - /* Define if you have the _expl function. */ #undef HAVE__EXPL diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index 0f86e26..2a53621 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -21,7 +21,7 @@ ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, ## USA. -## $Id: Makefile.am,v 1.56 2000/12/06 03:05:12 bkoz Exp $ +## $Id: Makefile.am,v 1.57 2000/12/10 20:51:22 apbianco Exp $ AUTOMAKE_OPTIONS = 1.3 gnits MAINT_CHARSET = latin1 @@ -252,7 +252,6 @@ install-data-local: myinstalldirs myinstallheaders myinstalldirs: if test -z "$(MULTISUBDIR)"; then \ $(mkinstalldirs) $(DESTDIR)$(myincludep)/bits; \ - $(mkinstalldirs) $(DESTDIR)$(myincludep)/backward; \ $(mkinstalldirs) $(DESTDIR)$(myincludep)/ext; \ fi @@ -273,8 +272,8 @@ myinstallheaders: $(INSTALL_DATA) $(src_incdir)/$$i $(myincludep)/ext/; \ done; \ for i in $(backward_headers); do \ - echo "$(INSTALL_DATA) $(src_incdir)/$$i $(myincludep)/backward/"; \ - $(INSTALL_DATA) $(src_incdir)/$$i $(myincludep)/backward/; \ + echo "$(INSTALL_DATA) $(src_incdir)/$$i $(myincludep)"; \ + $(INSTALL_DATA) $(src_incdir)/$$i $(myincludep); \ done; \ for i in $(c_base_headers); do \ echo "$(INSTALL_DATA) $(c_incdir)/$$i $(myincludep)/bits/"; \ diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 56eabec..0297121 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -525,7 +525,6 @@ install-data-local: myinstalldirs myinstallheaders myinstalldirs: if test -z "$(MULTISUBDIR)"; then \ $(mkinstalldirs) $(DESTDIR)$(myincludep)/bits; \ - $(mkinstalldirs) $(DESTDIR)$(myincludep)/backward; \ $(mkinstalldirs) $(DESTDIR)$(myincludep)/ext; \ fi myinstallheaders: @@ -539,8 +538,8 @@ myinstallheaders: $(INSTALL_DATA) $(src_incdir)/$$i $(myincludep)/ext/; \ done; \ for i in $(backward_headers); do \ - echo "$(INSTALL_DATA) $(src_incdir)/$$i $(myincludep)/backward/"; \ - $(INSTALL_DATA) $(src_incdir)/$$i $(myincludep)/backward/; \ + echo "$(INSTALL_DATA) $(src_incdir)/$$i $(myincludep)"; \ + $(INSTALL_DATA) $(src_incdir)/$$i $(myincludep); \ done; \ for i in $(c_base_headers); do \ echo "$(INSTALL_DATA) $(c_incdir)/$$i $(myincludep)/bits/"; \ -- 2.7.4