diff options
| author | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 1997-11-27 08:39:12 +0000 |
|---|---|---|
| committer | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 1997-11-27 08:39:12 +0000 |
| commit | 16b493168c670dafb7a5799b0f9f5bf4a3ccfe18 (patch) | |
| tree | 893c99f5f70859cbf64b95b87d6e4831e035e968 /libio | |
| parent | dcdffd64280fa4b6079db1fe212c153bab7c0e45 (diff) | |
* Makefile.in (insatll): Change gxx_includedir to gcc_include_dir.
* config.shared (gxx_includedir): Remove default definition.
* config/linux.mt: Change gxx_includedir to gxx_include_dir.
* config/linuxaxp1.mt: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@16786 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libio')
| -rw-r--r-- | libio/ChangeLog | 7 | ||||
| -rw-r--r-- | libio/Makefile.in | 6 | ||||
| -rw-r--r-- | libio/config.shared | 1 | ||||
| -rw-r--r-- | libio/config/linux.mt | 2 | ||||
| -rw-r--r-- | libio/config/linuxaxp1.mt | 4 |
5 files changed, 13 insertions, 7 deletions
diff --git a/libio/ChangeLog b/libio/ChangeLog index a9cf4d1e736..56dc8937daf 100644 --- a/libio/ChangeLog +++ b/libio/ChangeLog @@ -1,3 +1,10 @@ +Thu Nov 27 01:32:43 1997 Jeffrey A Law (law@cygnus.com) + + * Makefile.in (insatll): Change gxx_includedir to gcc_include_dir. + * config.shared (gxx_includedir): Remove default definition. + * config/linux.mt: Change gxx_includedir to gxx_include_dir. + * config/linuxaxp1.mt: Likewise. + Wed Nov 26 16:08:50 1997 Richard Henderson (rth@cygnus.com) * configure.in (target frags): Add powerpc*-linux-gnulibc1. diff --git a/libio/Makefile.in b/libio/Makefile.in index e4605698869..8117c7fd477 100644 --- a/libio/Makefile.in +++ b/libio/Makefile.in @@ -113,9 +113,9 @@ install: fi ; \ cd $(srcdir); \ for FILE in $(USER_INCLUDES); do if [ $$FILE != _G_config.h ]; then \ - rm -f $(gxx_includedir)/$$FILE ; \ - $(INSTALL_DATA) $$FILE $(gxx_includedir)/$$FILE ; \ - chmod a-x $(gxx_includedir)/$$FILE ; \ + rm -f $(gxx_include_dir)/$$FILE ; \ + $(INSTALL_DATA) $$FILE $(gxx_include_dir)/$$FILE ; \ + chmod a-x $(gxx_include_dir)/$$FILE ; \ else true; fi; done ; \ else true; \ fi diff --git a/libio/config.shared b/libio/config.shared index 0be43612fa6..1b23b353090 100644 --- a/libio/config.shared +++ b/libio/config.shared @@ -88,7 +88,6 @@ echo 'man9dir = $(mandir)/man9' echo 'infodir = $(prefix)/info' echo 'includedir = $(prefix)/include' -echo 'gxx_includedir = $(includedir)/g++' echo 'docdir = $(datadir)/doc' echo '' echo 'SHELL = /bin/sh' diff --git a/libio/config/linux.mt b/libio/config/linux.mt index ad1dc51f316..10536f98b15 100644 --- a/libio/config/linux.mt +++ b/libio/config/linux.mt @@ -1,7 +1,7 @@ # Use the libio which comes with the local libc. # That is where we keep the g++ header files. -gxx_includedir =$(prefix)/include/g++ +gxx_include_dir =$(prefix)/include/g++ # Comment this out to avoid including the stdio functions in libiostream.a: # LIBIOSTREAM_OBJECTS = $(IO_OBJECTS) $(IOSTREAM_OBJECTS) $(STDIO_WRAP_OBJECTS) $(OSPRIM_OBJECTS) diff --git a/libio/config/linuxaxp1.mt b/libio/config/linuxaxp1.mt index ef1617b6181..d9b7e8c7e95 100644 --- a/libio/config/linuxaxp1.mt +++ b/libio/config/linuxaxp1.mt @@ -6,5 +6,5 @@ all: install: install-axp-mt-headers install-axp-mt-headers: - $(INSTALL_DATA) libc-lock.h $(gxx_includedir)/libc-lock.h - $(INSTALL_DATA) stdio-lock.h $(gxx_includedir)/stdio-lock.h + $(INSTALL_DATA) libc-lock.h $(gxx_include_dir)/libc-lock.h + $(INSTALL_DATA) stdio-lock.h $(gxx_include_dir)/stdio-lock.h |