Makefile.in (insatll): Change gxx_includedir to gcc_include_dir.

        * 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.

From-SVN: r16786

libio/ChangeLog

+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.

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

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'

libio/config/linux.mt

 # 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)

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