diff options
| author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-12-18 18:03:08 +0000 |
|---|---|---|
| committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-12-18 18:03:08 +0000 |
| commit | 7bb22cfbbe450c5d393b647abd6554df3d7b9acd (patch) | |
| tree | 836c0fcb573f83255df1c5a899bd1a4bdb1cd4b8 /libstdc++-v3/src | |
| parent | d550dfb2fcf6ed621b99093a5371b3d694763c3a (diff) | |
| download | ppe42-gcc-7bb22cfbbe450c5d393b647abd6554df3d7b9acd.tar.gz ppe42-gcc-7bb22cfbbe450c5d393b647abd6554df3d7b9acd.zip | |
2000-12-18 Benjamin Kosnik <bkoz@redhat.com>
* configure.in: Set os_include_dir for cross_compiles.
* configure: Regenerate.
* configure.target (l_glibcpp_cxxflags): Don't try to be clever
when assigning ATOMICITYH. Only special case the special cases...
2000-12-15 Benjamin Kosnik <bkoz@redhat.com>
* configure.in (gxx_target_include_dir): Install target-dependent
include files in a target-dependent place.
* configure: Regenerate.
* src/Makefile.am: Add in support here.
* src/Makefile.in: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@38354 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/src')
| -rw-r--r-- | libstdc++-v3/src/Makefile.am | 9 | ||||
| -rw-r--r-- | libstdc++-v3/src/Makefile.in | 8 |
2 files changed, 12 insertions, 5 deletions
diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index 2a53621b92f..0e4a0271177 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.57 2000/12/10 20:51:22 apbianco Exp $ +## $Id: Makefile.am,v 1.58 2000/12/15 00:55:02 bkoz Exp $ AUTOMAKE_OPTIONS = 1.3 gnits MAINT_CHARSET = latin1 @@ -233,6 +233,8 @@ myincludep = $(prefix)/include/g++-@libstdcxx_interface@ endif endif +targetincludep = @gxx_target_include_dir@ + # We have our own special, ridiculously complicated installation routine # here, as automake/autoconf is currently brain-damaged when it comes # to installing sub-directories of headers. In particular, we want to @@ -253,6 +255,7 @@ myinstalldirs: if test -z "$(MULTISUBDIR)"; then \ $(mkinstalldirs) $(DESTDIR)$(myincludep)/bits; \ $(mkinstalldirs) $(DESTDIR)$(myincludep)/ext; \ + $(mkinstalldirs) $(DESTDIR)$(targetincludep)/bits; \ fi # NB: As libio_headers may be empty, need this to make sure bash doesn't @@ -284,8 +287,8 @@ myinstallheaders: $(INSTALL_DATA) $(src_incdir)/std/$$i $(myincludep); \ done; \ for i in $(build_headers); do \ - echo "$(INSTALL_DATA) $(bld_incdir)/$$i $(myincludep)/bits/"; \ - $(INSTALL_DATA) $(bld_incdir)/$$i $(myincludep)/bits/; \ + echo "$(INSTALL_DATA) $(bld_incdir)/$$i $(targetincludep)/bits/"; \ + $(INSTALL_DATA) $(bld_incdir)/$$i $(targetincludep)/bits/; \ done; \ libio_headers_install='$(libio_headers)'; \ for i in $$libio_headers_install; do \ diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 02971211322..bd8bf837acf 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -101,6 +101,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ glibcpp_basedir = @glibcpp_basedir@ gxx_include_dir = @gxx_include_dir@ +gxx_target_include_dir = @gxx_target_include_dir@ ifGNUmake = @ifGNUmake@ libinst_wstring_la = @libinst_wstring_la@ libio_la = @libio_la@ @@ -195,6 +196,8 @@ libstdc___la_DEPENDENCIES = $(libstdc___la_LIBADD) @GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@myincludep = $(libdir)/gcc-lib/$(target_alias)/@gcc_version@/include/g++ @GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@myincludep = $(prefix)/include/g++-@libstdcxx_interface@ +targetincludep = @gxx_target_include_dir@ + # NB: As libio_headers may be empty, need this to make sure bash doesn't # choke on an empty for... loop by using libio_headers_install # NB: installation of shadow headers is not attempted. @@ -526,6 +529,7 @@ myinstalldirs: if test -z "$(MULTISUBDIR)"; then \ $(mkinstalldirs) $(DESTDIR)$(myincludep)/bits; \ $(mkinstalldirs) $(DESTDIR)$(myincludep)/ext; \ + $(mkinstalldirs) $(DESTDIR)$(targetincludep)/bits; \ fi myinstallheaders: if test -z "$(MULTISUBDIR)"; then \ @@ -550,8 +554,8 @@ myinstallheaders: $(INSTALL_DATA) $(src_incdir)/std/$$i $(myincludep); \ done; \ for i in $(build_headers); do \ - echo "$(INSTALL_DATA) $(bld_incdir)/$$i $(myincludep)/bits/"; \ - $(INSTALL_DATA) $(bld_incdir)/$$i $(myincludep)/bits/; \ + echo "$(INSTALL_DATA) $(bld_incdir)/$$i $(targetincludep)/bits/"; \ + $(INSTALL_DATA) $(bld_incdir)/$$i $(targetincludep)/bits/; \ done; \ libio_headers_install='$(libio_headers)'; \ for i in $$libio_headers_install; do \ |
