configure.in (version, [...]): Define.

X
	* configure.in (version, target_alias): Define.
	* Makefile.in (version, target_alias, libsubdir): Define.
	(install): Remove check for libsubdir.

From-SVN: r20633

diff --git a/libf2c/ChangeLog.egcs b/libf2c/ChangeLog.egcs
index 002921b13cac1ede324da673c536ae0b70d9b228..eb0948a86ae968f3850a2c411ae8e73e78c997a6 100644 (file)
--- a/libf2c/ChangeLog.egcs
+++ b/libf2c/ChangeLog.egcs
@@ -1,3 +1,10 @@
+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.
+
 Mon Apr 27 22:52:31 1998  Richard Henderson  <rth@cygnus.com>
 
        * libU77/ltime_.c: Bounce the ftnint argument through a local time_t.

diff --git a/libf2c/Makefile.in b/libf2c/Makefile.in
index abce5ea5c6772d4eeac4a92336cb4fcac59ccf2e..a48b6e25713571b4efddb9196f2a974c8e15c5af 100644 (file)
--- a/libf2c/Makefile.in
+++ b/libf2c/Makefile.in
@@ -26,6 +26,8 @@ SHELL = /bin/sh
 srcdir = @srcdir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+target_alias = @target_alias@
+version = @version@
 
 bindir = $(exec_prefix)/bin
 libdir = $(exec_prefix)/lib
@@ -34,6 +36,7 @@ mandir = $(prefix)/man
 infodir = $(prefix)/info
 includedir = $(prefix)/include
 docdir = $(datadir)/doc
+libsubdir = $(libdir)/gcc-lib/$(target_alias)/$(version)
 
 TO_TOPDIR = ..
 
@@ -199,27 +202,6 @@ check:
        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)