Re: A new libg++ addon for egcs

[Lee Iverson <leei at ai dot sri dot com>]

In message <m0xfrIK-0004ecC@ocean.lucon.org> you write:
> 
> Here is the patch for libg++-2.8.0b6.3 to bring it to 2.8.0b6.4. 
> libg++-2.8.0b6.4 is at ftp://ftp.yggdrasil.com/private/hjl.

The following is also needed (gxx_includedir -> gxx_include_dir):

*** Makefile.in.~1~	Fri Oct 10 15:52:49 1997
--- Makefile.in	Fri Dec  5 14:05:27 1997
*************** installcheck: check
*** 148,152 ****
  .stmp-genclass: $(BUILD_LIBS)
  	@rootme=`pwd`/ ; export rootme ; cd genclass ; \
! 	  $(MAKE) $(FLAGS_TO_PASS) "gxx_includedir=$(gxx_includedir)"
  	touch $@
  
--- 148,152 ----
  .stmp-genclass: $(BUILD_LIBS)
  	@rootme=`pwd`/ ; export rootme ; cd genclass ; \
! 	  $(MAKE) $(FLAGS_TO_PASS) "gxx_include_dir=$(gxx_include_dir)"
  	touch $@
  
*************** installcheck: check
*** 184,189 ****
  .PHONY: install
  install:
! 	@if [ -f $(gxx_includedir)/unistd.h ] ; then echo; \
! 	  echo '*** You seem to have files in $(gxx_includedir)/g++-include'; \
  	  echo '*** left over from an old release of libg++.  These must be removed.'; \
  	  echo '*** Please see $(srcdir)/README for more information.'; \
--- 184,189 ----
  .PHONY: install
  install:
! 	@if [ -f $(gxx_include_dir)/unistd.h ] ; then echo; \
! 	  echo '*** You seem to have files in $(gxx_include_dir)/g++-include'; \
  	  echo '*** left over from an old release of libg++.  These must be removed.'; \
  	  echo '*** Please see $(srcdir)/README for more information.'; \
*************** install:
*** 215,219 ****
  		if [ -d $$D ] ; then \
  			(rootme=`pwd`/ ; export rootme ; cd $$D;\
! 			  $(MAKE) $(FLAGS_TO_PASS) "gxx_includedir=$(gxx_includedir)" install) ; \
  		else true ; \
  		fi ; \
--- 215,219 ----
  		if [ -d $$D ] ; then \
  			(rootme=`pwd`/ ; export rootme ; cd $$D;\
! 			  $(MAKE) $(FLAGS_TO_PASS) "gxx_include_dir=$(gxx_include_dir)" install) ; \
  		else true ; \
  		fi ; \
*** genclass/Makefile.in.~1~	Sat Mar 11 11:42:33 1995
--- genclass/Makefile.in	Fri Dec  5 14:05:36 1997
*************** srcdir = .
*** 8,12 ****
  genclass: $(srcdir)/genclass.sh
  	echo "/^PROTODIR=/c\\" > sedscript
! 	echo "PROTODIR=$$\{PROTODIR-$(gxx_includedir)/gen\}" >> sedscript
  	sed <../Makefile -n -e '/VERSION/s/LIBG++_DIST_VERSION *= *\(.*\)/s|<VERSION>|\1|/p' >> sedscript
  	sed -f sedscript < $(srcdir)/genclass.sh > genclass.tmp
--- 8,12 ----
  genclass: $(srcdir)/genclass.sh
  	echo "/^PROTODIR=/c\\" > sedscript
! 	echo "PROTODIR=$$\{PROTODIR-$(gxx_include_dir)/gen\}" >> sedscript
  	sed <../Makefile -n -e '/VERSION/s/LIBG++_DIST_VERSION *= *\(.*\)/s|<VERSION>|\1|/p' >> sedscript
  	sed -f sedscript < $(srcdir)/genclass.sh > genclass.tmp
*** src/Makefile.in.~1~	Tue Sep 23 19:19:34 1997
--- src/Makefile.in	Fri Dec  5 14:04:22 1997
*************** install:
*** 68,75 ****
  	if [ -z "$(MULTISUBDIR)" ]; then \
  	  for FILE in `(cd ${srcdir}; echo *.h gen/*.ccP gen/*.hP)`; do \
! 	    rm -f $(gxx_includedir)/$$FILE ; \
! 	    $(INSTALL_DATA) ${srcdir}/$$FILE $(gxx_includedir)/$$FILE \
  	      || exit 1; \
! 	    chmod a-x,a+r $(gxx_includedir)/$$FILE ; \
  	  done ; \
  	else true ; \
--- 68,75 ----
  	if [ -z "$(MULTISUBDIR)" ]; then \
  	  for FILE in `(cd ${srcdir}; echo *.h gen/*.ccP gen/*.hP)`; do \
! 	    rm -f $(gxx_include_dir)/$$FILE ; \
! 	    $(INSTALL_DATA) ${srcdir}/$$FILE $(gxx_include_dir)/$$FILE \
  	      || exit 1; \
! 	    chmod a-x,a+r $(gxx_include_dir)/$$FILE ; \
  	  done ; \
  	else true ; \

-------------------------------------------------------------------------------
Lee Iverson     		SRI International
leei@ai.sri.com			333 Ravenswood Ave., Menlo Park CA 94025
http://www.ai.sri.com/~leei/	(650) 859-3307