This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
fix for libf2c installation
- To: Craig Burley <burley at gnu dot org>
- Subject: fix for libf2c installation
- From: Dave Love <d dot love at dl dot ac dot uk>
- Date: 21 Jun 1998 01:11:26 +0100
- Cc: egcs-patches at cygnus dot com
This seems to be the right way to fix the problem of libsubdir not
being defined for libf2c installation.
[I don't understand why INSTALL is set explcitly to the shell script
rather than configured and why @AR@ and @RANLIB@ aren't used; their
definitions in configure could be removed as it is.]
1998-06-21 Dave Love <d.love@dl.ac.uk>
* configure.in (version, target_alias): Define.
* Makefile.in (version, target_alias, libsubdir): Define.
(install): Remove check for libsubdir.
Index: Makefile.in
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/libf2c/Makefile.in,v
retrieving revision 1.7
diff -u -p -c -r1.7 Makefile.in
*** Makefile.in 1998/06/15 07:51:58 1.7
--- Makefile.in 1998/06/20 23:54:57
*************** SHELL = /bin/sh
*** 26,31 ****
--- 26,33 ----
srcdir = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
+ target_alias = @target_alias@
+ version = @version@
bindir = $(exec_prefix)/bin
libdir = $(exec_prefix)/lib
*************** mandir = $(prefix)/man
*** 34,39 ****
--- 36,42 ----
infodir = $(prefix)/info
includedir = $(prefix)/include
docdir = $(datadir)/doc
+ libsubdir = $(libdir)/gcc-lib/$(target_alias)/$(version)
TO_TOPDIR = ..
*************** check:
*** 199,225 ****
cd libU77; $(MAKE) G77DIR=../../../gcc/ check
install:
- @if [ x$(libsubdir) = x ]; then \
- echo ''; \
- echo 'libf2c error: libsubdir environment variable is not'; \
- echo ' exported by top-level Makefile. libg2c.a and g2c.h'; \
- echo ' are installed in the directory tree identified named'; \
- echo ' by that variable, the same tree in which the gcc-'; \
- echo ' specific executables, libraries, and so on are installed.'; \
- echo ' Rather than try to extract the name of this tree via'; \
- echo ' a kludge, libf2c/Makefile.in simply assumes it is passed'; \
- echo ' in as an environment variable. Someone needs to make'; \
- echo ' the appropriate changes to the top-level Makefile.in for'; \
- echo ' this to happen.'; \
- echo ''; \
- echo ' In the meantime, you can try setting libsubdir explicitly'; \
- echo ' in the make command line via libsubdir=/foo/lib/gcc-lib/...,'; \
- echo ' where foo and ... indicate wherever the cc1 and f771'; \
- echo ' executables were installed as part of this overall'; \
- echo ' installation process.'; \
- echo ''; \
- exit 1; \
- fi
$(INSTALL_DATA) $(LIBG2C) $(libsubdir)/$(LIBG2C).n
( cd $(libsubdir) ; $(RANLIB) $(LIBG2C).n )
mv -f $(libsubdir)/$(LIBG2C).n $(libsubdir)/$(LIBG2C)
--- 202,207 ----
Index: configure.in
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/libf2c/configure.in,v
retrieving revision 1.7
diff -u -p -c -r1.7 configure.in
*** configure.in 1998/06/15 07:52:01 1.7
--- configure.in 1998/06/20 23:54:58
*************** test -f libF77/makefile && mv libF77/mak
*** 343,348 ****
--- 343,354 ----
test -f libI77/makefile && mv libI77/makefile libI77/makefile.ori
test -f libU77/makefile && mv libU77/makefile libU77/makefile.ori
+ # Get the version number from the toplevel
+ version=`sed -e 's/.*\"\([[^ \"]]*\)[[ \"]].*/\1/' < ${srcdir}/../gcc/version.c`
+ AC_SUBST(version)
+ AC_CANONICAL_SYSTEM
+ AC_SUBST(target_alias)
+
AC_CONFIG_SUBDIRS(libU77)
AC_OUTPUT(Makefile g2c.h libI77/Makefile libF77/Makefile)