[Part of] your Dec., 4th change to libf2c/Makefile.in.

[Toon Moene]

About 2 weeks ago, I wrote:

> On the 4th of December last year, you changed the build of libf2c to use
> object lists with libtool.
> 
> As part of (but as far as I can see, independent of) this change, you
> updated libf2c/Makefile.in as follows:
> 
>  install: all
>         $(LIBTOOL) --mode=install $(INSTALL_DATA) $(LIBG2C)
> $(libsubdir)/$(MULTISUBDIR)
> -       (cd $(libsubdir)/$(MULTISUBDIR) ; mv -f $(LIBG2C_BASE).*
> $(prefix)/lib)
>         $(INSTALL_DATA) libfrtbegin.a $(libsubdir)/$(MULTISUBDIR)

> Alhough the original shell command wasn't right, this one isn't either.
> The net effect of this change is that libg2c.so[0.[0.0]] now resides in
> 
>         ..../lib/gcc-lib/i686-pc-linux-gnu/3.1
> 
> in stead of
> 
>         ..../lib
> 
> as libgcc_s.so[.1] et al. do.
> 
> This is probably the main reason why Andreas Jaeger's SPECfp2000 run
> doesn't show any Fortran results as of Dec 4th anymore.

I propose the attached patch to libf2c/Makefile.in to solve this problem
(for now).  Passed make bootstrap (C and Fortran), make check (Fortran
only) and make install (and a test compile-and-run of the installed
compiler) on i686-pc-linux-gnu)

Please comment.

Thanks,

-- 
Toon Moene - mailto:toon@moene.indiv.nluug.nl - phoneto: +31 346 214290
Saturnushof 14, 3738 XG  Maartensdijk, The Netherlands
Maintainer, GNU Fortran 77: http://gcc.gnu.org/onlinedocs/g77_news.html
Join GNU Fortran 95: http://g95.sourceforge.net/ (under construction)
-------------- next part --------------
*** Makefile.in.orig	Fri Jan  4 22:41:44 2002
--- Makefile.in	Thu Jan 17 20:24:34 2002
*************** $(LIBG2C): s-libi77 s-libf77 s-libu77 s-
*** 143,147 ****
  	$(LIBTOOL) --mode=link $(CC) -o $@ \
  	  -version-info $(VERSION_MAJOR):$(VERSION_MINOR):$(VERSION_SUB) \
! 	  -rpath $(libsubdir)/$(MULTISUBDIR) \
  	  -objectlist s-libe77 \
  	  -objectlist s-libf77 \
--- 143,147 ----
  	$(LIBTOOL) --mode=link $(CC) -o $@ \
  	  -version-info $(VERSION_MAJOR):$(VERSION_MINOR):$(VERSION_SUB) \
! 	  -rpath $(libdir) \
  	  -objectlist s-libe77 \
  	  -objectlist s-libf77 \
*************** check:
*** 205,209 ****
  
  install: all
! 	$(LIBTOOL) --mode=install $(INSTALL_DATA) $(LIBG2C) $(libsubdir)/$(MULTISUBDIR)
  	$(INSTALL_DATA) libfrtbegin.a $(libsubdir)/$(MULTISUBDIR)
  	$(RANLIB) $(libsubdir)/$(MULTISUBDIR)/libfrtbegin.a
--- 205,209 ----
  
  install: all
! 	$(LIBTOOL) --mode=install $(INSTALL) $(LIBG2C) $(libdir)
  	$(INSTALL_DATA) libfrtbegin.a $(libsubdir)/$(MULTISUBDIR)
  	$(RANLIB) $(libsubdir)/$(MULTISUBDIR)/libfrtbegin.a
*************** install-strip:
*** 225,229 ****
  
  uninstall:
! 	rm -f $(libsubdir)/$(MULTISUBDIR)/include/g2c.h $(libsubdir)/$(MULTISUBDIR)/$(LIBG2C_BASE).*
  	rm -f $(prefix)/lib/$(LIBG2C_BASE).so*
  	$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO="$@"
--- 225,229 ----
  
  uninstall:
! 	rm -f $(libsubdir)/$(MULTISUBDIR)/include/g2c.h $(libdir)/$(LIBG2C_BASE).*
  	rm -f $(prefix)/lib/$(LIBG2C_BASE).so*
  	$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO="$@"