diff options
| author | Richard Sandiford <rsandifo@redhat.com> | 2004-12-03 11:15:25 +0000 |
|---|---|---|
| committer | Richard Sandiford <rsandifo@gcc.gnu.org> | 2004-12-03 11:15:25 +0000 |
| commit | dafb7f3f52bbc30f565060d5d63bc93614a97806 (patch) | |
| tree | d40e8700152bef5f4900b894b253bb6daa770ae0 /libjava/Makefile.am | |
| parent | f4ed7d2144f6a1754e88e03a6529aa79b4da40e4 (diff) | |
| download | gcc-dafb7f3f52bbc30f565060d5d63bc93614a97806.zip gcc-dafb7f3f52bbc30f565060d5d63bc93614a97806.tar.gz gcc-dafb7f3f52bbc30f565060d5d63bc93614a97806.tar.bz2 | |
re PR libgcj/7305 (Install path for libgcj header files)
PR libgcj/7305
* configure.ac: Use TL_AC_GXX_INCLUDE_DIR.
* Makefile.am (install-data-local): Install headers into
$(gxx_include_dir) rather than $(includedir).
(AM_MAKEFLAGS): Pass down gxx_include_dir.
* gcj/Makefile.am (gcjdir): Set to $(gxx_include_dir)/gcj.
* include/Makefile.am (tool_include__HEADERS): Define this...
(include_HEADERS): ...instead of this.
* configure, aclocal.m4, Makefile.in, gcj/Makefile.in: Regenerate.
* include/Makefile.in, testsuite/Makefile.in: Regenerate.
From-SVN: r91682
Diffstat (limited to 'libjava/Makefile.am')
| -rw-r--r-- | libjava/Makefile.am | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 253e190..9ce95a0 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -872,10 +872,10 @@ install-data-local: @: $(call write_entries_to_file,$(nat_headers_install) $(extra_headers),tmp-ilist) @cat tmp-ilist | while read f; do \ d="`echo $$f | sed -e 's,/[^/]*$$,,'`"; \ - $(mkinstalldirs) $(DESTDIR)$(includedir)/$$d; \ + $(mkinstalldirs) $(DESTDIR)$(gxx_include_dir)/$$d; \ if test -f $(srcdir)/$$f; then p=$(srcdir)/$$f; else p=$$f; fi; \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/$$f"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/$$f; \ + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(gxx_include_dir)/$$f"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(gxx_include_dir)/$$f; \ done -@rm -f tmp-ilist ## FIXME: the obvious approach using lib_DATA doesn't work with @@ -887,16 +887,16 @@ install-data-local: done $(INSTALL_DATA) $(srcdir)/java/util/logging/logging.properties $(DESTDIR)$(propdir)/logging.properties ## Install inner class headers. - $(INSTALL_DATA) 'java/io/ObjectOutputStream$$PutField.h' $(DESTDIR)$(includedir)/java/io/ - $(INSTALL_DATA) 'java/io/ObjectInputStream$$GetField.h' $(DESTDIR)$(includedir)/java/io/ - $(INSTALL_DATA) 'java/nio/channels/Pipe$$SinkChannel.h' $(DESTDIR)$(includedir)/java/nio/channels/ - $(INSTALL_DATA) 'java/nio/channels/Pipe$$SourceChannel.h' $(DESTDIR)$(includedir)/java/nio/channels/ - $(INSTALL_DATA) 'java/lang/reflect/Proxy$$ProxyData.h' $(DESTDIR)$(includedir)/java/lang/reflect/ - $(INSTALL_DATA) 'java/lang/reflect/Proxy$$ProxyType.h' $(DESTDIR)$(includedir)/java/lang/reflect/ - $(INSTALL_DATA) 'gnu/java/net/PlainSocketImpl$$SocketInputStream.h' $(DESTDIR)$(includedir)/gnu/java/net/ - $(INSTALL_DATA) 'gnu/java/net/PlainSocketImpl$$SocketOutputStream.h' $(DESTDIR)$(includedir)/gnu/java/net/ - $(INSTALL_DATA) 'gnu/java/nio/PipeImpl$$SinkChannelImpl.h' $(DESTDIR)$(includedir)/gnu/java/nio/ - $(INSTALL_DATA) 'gnu/java/nio/PipeImpl$$SourceChannelImpl.h' $(DESTDIR)$(includedir)/gnu/java/nio/ + $(INSTALL_DATA) 'java/io/ObjectOutputStream$$PutField.h' $(DESTDIR)$(gxx_include_dir)/java/io/ + $(INSTALL_DATA) 'java/io/ObjectInputStream$$GetField.h' $(DESTDIR)$(gxx_include_dir)/java/io/ + $(INSTALL_DATA) 'java/nio/channels/Pipe$$SinkChannel.h' $(DESTDIR)$(gxx_include_dir)/java/nio/channels/ + $(INSTALL_DATA) 'java/nio/channels/Pipe$$SourceChannel.h' $(DESTDIR)$(gxx_include_dir)/java/nio/channels/ + $(INSTALL_DATA) 'java/lang/reflect/Proxy$$ProxyData.h' $(DESTDIR)$(gxx_include_dir)/java/lang/reflect/ + $(INSTALL_DATA) 'java/lang/reflect/Proxy$$ProxyType.h' $(DESTDIR)$(gxx_include_dir)/java/lang/reflect/ + $(INSTALL_DATA) 'gnu/java/net/PlainSocketImpl$$SocketInputStream.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/net/ + $(INSTALL_DATA) 'gnu/java/net/PlainSocketImpl$$SocketOutputStream.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/net/ + $(INSTALL_DATA) 'gnu/java/nio/PipeImpl$$SinkChannelImpl.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/nio/ + $(INSTALL_DATA) 'gnu/java/nio/PipeImpl$$SourceChannelImpl.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/nio/ ## Don't install java/nio/DirectByteBufferImpl$$ReadWrite.h here. It's for internal use only. @@ -3604,6 +3604,7 @@ AM_MAKEFLAGS = \ "infodir=$(infodir)" \ "libdir=$(libdir)" \ "prefix=$(prefix)" \ + "gxx_include_dir=$(gxx_include_dir)" \ "AR=$(AR)" \ "AS=$(AS)" \ "LD=$(LD)" \ |