summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Wendling <wendling@ncsa.uiuc.edu>2000-10-27 21:54:54 (GMT)
committerBill Wendling <wendling@ncsa.uiuc.edu>2000-10-27 21:54:54 (GMT)
commit78365de55f2cf1859bcfbb4cfba486d3c9478760 (patch)
treee13ea82acb3d0407806651b0984daceb0f35ee07
parent592f0fc876ad6365f6149d28b89891e283e45d88 (diff)
downloadhdf5-78365de55f2cf1859bcfbb4cfba486d3c9478760.zip
hdf5-78365de55f2cf1859bcfbb4cfba486d3c9478760.tar.gz
hdf5-78365de55f2cf1859bcfbb4cfba486d3c9478760.tar.bz2
[svn-r2745] Purpose:
Bug fix...I hope Description: For some reason, libtool wasn't generating a .lai library file in the .libs directory. It needs this to install things, apparently. Solution: Major hack! I force a ln to the "real" one libtools wants. Platforms tested: Modi4
-rw-r--r--fortran/config/commence.in3
-rw-r--r--fortran/config/conclude.in1
2 files changed, 3 insertions, 1 deletions
diff --git a/fortran/config/commence.in b/fortran/config/commence.in
index 879f27b..6486bff 100644
--- a/fortran/config/commence.in
+++ b/fortran/config/commence.in
@@ -45,10 +45,11 @@ docdir=@exec_prefix@/doc
PUB_LIB=$(LIB)
## Shared libraries
+LT_STATIC_LIB=@LT_STATIC_LIB@
DYNAMIC_DIRS=@DYNAMIC_DIRS@
LT=$(top_builddir)/libtool
LT_CCOMPILE=$(LT) --mode=compile $(CC)
-LT_LINK_CLIB=$(LT) --mode=link $(CC) -rpath $(libdir)
+LT_LINK_CLIB=$(LT) --mode=link $(CC) $(LT_STATIC_LIB) -rpath $(libdir)
LT_LINK_CEXE=$(LT) --mode=link $(CC) $(DYNAMIC_DIRS) -rpath $(bindir)
LT_RUN=$(LT) --mode=execute
LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM)
diff --git a/fortran/config/conclude.in b/fortran/config/conclude.in
index 6d8a181..2c1fa34 100644
--- a/fortran/config/conclude.in
+++ b/fortran/config/conclude.in
@@ -62,6 +62,7 @@ $(DOCDIR):
install: $(PUB_LIB) $(PUB_HDR) $(PUB_PROGS) $(libdir) $(includedir) $(bindir)
@for f in X $(PUB_LIB); do \
if test $$f != X; then \
+ (cd .libs && rm -f $(PUB_LIB)i && ln -s ../$(PUB_LIB) $(PUB_LIB)i); \
($(LT_INSTALL_LIB) $$f $(libdir)/. || exit 1); \
fi; \
done