From mboxrd@z Thu Jan  1 00:00:00 1970
From: mrs@wrs.com (Mike Stump)
To: egcs@cygnus.com
Subject: small patch for sys-include
Date: Thu, 19 Feb 1998 14:59:00 -0000
Message-id: <199802192259.OAA04426@kankakee.wrs.com>
X-SW-Source: 1998-02/msg00940.html

I tried configuring like this:

~/net/egcs/configure --with-headers=/view/mrs.tor1_0_1.cpp/vobs/wpwr/target/h -v --target m68k-wrs-vxworks --prefix=/folk/mrs/packages/egcs-980219.m68k

and noticed that sys-include was in two different places.  We need to
change at least one of them to match the other.  I bubbled the
directory up.

1998-02-19  Mike Stump  <mrs@wrs.com>

	* Makefile.in: Use $tooldir for sys-include to match toplevel
	configure.

Doing diffs in gcc:
*** Makefile.in.~1~	Thu Feb 19 13:42:56 1998
--- Makefile.in	Thu Feb 19 14:33:44 1998
*************** cccp.o: cccp.c $(CONFIG_H) pcp.h version
*** 1754,1760 ****
  	  -DGPLUSPLUS_INCLUDE_DIR=\"$(gxx_include_dir)\" \
  	  -DOLD_GPLUSPLUS_INCLUDE_DIR=\"$(old_gxx_include_dir)\" \
  	  -DLOCAL_INCLUDE_DIR=\"$(includedir)\" \
! 	  -DCROSS_INCLUDE_DIR=\"$(libsubdir)/sys-include\" \
  	  -DTOOL_INCLUDE_DIR=\"$(tooldir)/include\" \
  	  -c `echo $(srcdir)/cccp.c | sed 's,^\./,,'`
  
--- 1754,1760 ----
  	  -DGPLUSPLUS_INCLUDE_DIR=\"$(gxx_include_dir)\" \
  	  -DOLD_GPLUSPLUS_INCLUDE_DIR=\"$(old_gxx_include_dir)\" \
  	  -DLOCAL_INCLUDE_DIR=\"$(includedir)\" \
! 	  -DCROSS_INCLUDE_DIR=\"$(tooldir)/sys-include\" \
  	  -DTOOL_INCLUDE_DIR=\"$(tooldir)/include\" \
  	  -c `echo $(srcdir)/cccp.c | sed 's,^\./,,'`
  
*************** cpplib.o: cpplib.c $(CONFIG_H) cpplib.h 
*** 1771,1777 ****
  	  -DGPLUSPLUS_INCLUDE_DIR=\"$(gxx_include_dir)\" \
  	  -DOLD_GPLUSPLUS_INCLUDE_DIR=\"$(old_gxx_include_dir)\" \
  	  -DLOCAL_INCLUDE_DIR=\"$(includedir)\" \
! 	  -DCROSS_INCLUDE_DIR=\"$(libsubdir)/sys-include\" \
  	  -DTOOL_INCLUDE_DIR=\"$(tooldir)/include\" \
  	  -c `echo $(srcdir)/cpplib.c | sed 's,^\./,,'`
  
--- 1771,1777 ----
  	  -DGPLUSPLUS_INCLUDE_DIR=\"$(gxx_include_dir)\" \
  	  -DOLD_GPLUSPLUS_INCLUDE_DIR=\"$(old_gxx_include_dir)\" \
  	  -DLOCAL_INCLUDE_DIR=\"$(includedir)\" \
! 	  -DCROSS_INCLUDE_DIR=\"$(tooldir)/sys-include\" \
  	  -DTOOL_INCLUDE_DIR=\"$(tooldir)/include\" \
  	  -c `echo $(srcdir)/cpplib.c | sed 's,^\./,,'`
  
*************** protoize.o: protoize.c getopt.h $(CONFIG
*** 1804,1810 ****
  	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
            -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
  	  -DGPLUSPLUS_INCLUDE_DIR=\"$(gxx_include_dir)\" \
!           -DCROSS_INCLUDE_DIR=\"$(libsubdir)/sys-include\" \
  	  -DTOOL_INCLUDE_DIR=\"$(tooldir)/include\" \
  	  -DLOCAL_INCLUDE_DIR=\"$(includedir)\" \
  	  -DSTD_PROTO_DIR=\"$(libsubdir)\" \
--- 1804,1810 ----
  	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
            -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
  	  -DGPLUSPLUS_INCLUDE_DIR=\"$(gxx_include_dir)\" \
!           -DCROSS_INCLUDE_DIR=\"$(tooldir)/sys-include\" \
  	  -DTOOL_INCLUDE_DIR=\"$(tooldir)/include\" \
  	  -DLOCAL_INCLUDE_DIR=\"$(includedir)\" \
  	  -DSTD_PROTO_DIR=\"$(libsubdir)\" \
*************** unprotoize.o: unprotoize.c protoize.c ge
*** 1814,1820 ****
  	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
            -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
  	  -DGPLUSPLUS_INCLUDE_DIR=\"$(gxx_include_dir)\" \
!           -DCROSS_INCLUDE_DIR=\"$(libsubdir)/sys-include\" \
  	  -DTOOL_INCLUDE_DIR=\"$(tooldir)/include\" \
  	  -DLOCAL_INCLUDE_DIR=\"$(includedir)\" \
  	  -DSTD_PROTO_DIR=\"$(libsubdir)\" \
--- 1814,1820 ----
  	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
            -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
  	  -DGPLUSPLUS_INCLUDE_DIR=\"$(gxx_include_dir)\" \
!           -DCROSS_INCLUDE_DIR=\"$(tooldir)/sys-include\" \
  	  -DTOOL_INCLUDE_DIR=\"$(tooldir)/include\" \
  	  -DLOCAL_INCLUDE_DIR=\"$(includedir)\" \
  	  -DSTD_PROTO_DIR=\"$(libsubdir)\" \
--------------