diff options
| author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-02-06 06:32:01 +0000 |
|---|---|---|
| committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-02-06 06:32:01 +0000 |
| commit | e3bb8f1a5064dacdebe5ef02db9f93ac1e1d7845 (patch) | |
| tree | 9474c0f861c95c082bedfbf9775931d3a53e4805 /libstdc++-v3/libsupc++ | |
| parent | da0c698293c9fd89e45bcc1421fa3139f0c6826c (diff) | |
| download | gcc-e3bb8f1a5064dacdebe5ef02db9f93ac1e1d7845.tar.gz | |
2001-02-05 Benjamin Kosnik <bkoz@redhat.com>
* acinclude.m4 (GLIBCPP_EXPORT_INSTALL_INFO): New
macro. Consolidate all the bits to do with where includes might be
installed.
* aclocal.m4: Regenerate.
* configure.in: Use it.
* configure: Regenerate.
* src/Makefile.am (targetincludep): Use simplified rules.
(targetincludep): Rename gxx_target_include_dir.
(myincludep): Rename gxx_include_dir.
* src/Makefile.in: Regenerate.
* libsupc++/Makefile.am: Use simplified rules.
* libsupc++/Makefile.in: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@39479 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/libsupc++')
| -rw-r--r-- | libstdc++-v3/libsupc++/Makefile.am | 10 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/Makefile.in | 6 |
2 files changed, 1 insertions, 15 deletions
diff --git a/libstdc++-v3/libsupc++/Makefile.am b/libstdc++-v3/libsupc++/Makefile.am index 32511dbd479..9d020c9a7dd 100644 --- a/libstdc++-v3/libsupc++/Makefile.am +++ b/libstdc++-v3/libsupc++/Makefile.am @@ -100,17 +100,7 @@ sources = \ libsupc___la_SOURCES = $(sources) libsupc__convenience_la_SOURCES = $(sources) -# Check for various configure bits that change where the headers get installed. -if GXX_INCLUDE_DIR glibcppinstalldir = @gxx_include_dir@ -else -if VERSION_SPECIFIC_LIBS -glibcppinstalldir = $(libdir)/gcc-lib/$(target_alias)/@gcc_version@/include/g++ -else -glibcppinstalldir = $(prefix)/include/g++-@libstdcxx_interface@ -endif -endif - glibcppinstall_HEADERS = $(headers) # Flags to force separate libtool library to be static only. diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in index 2552f21f005..412983ed74b 100644 --- a/libstdc++-v3/libsupc++/Makefile.in +++ b/libstdc++-v3/libsupc++/Makefile.in @@ -101,11 +101,9 @@ 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@ -libstdcxx_interface = @libstdcxx_interface@ toplevel_srcdir = @toplevel_srcdir@ AUTOMAKE_OPTIONS = 1.3 cygnus @@ -163,10 +161,8 @@ sources = del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc exception_support. libsupc___la_SOURCES = $(sources) libsupc__convenience_la_SOURCES = $(sources) -@GXX_INCLUDE_DIR_TRUE@glibcppinstalldir = @gxx_include_dir@ -@GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@glibcppinstalldir = $(libdir)/gcc-lib/$(target_alias)/@gcc_version@/include/g++ -@GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@glibcppinstalldir = $(prefix)/include/g++-@libstdcxx_interface@ +glibcppinstalldir = @gxx_include_dir@ glibcppinstall_HEADERS = $(headers) # Flags to force separate libtool library to be static only. |