From a1932ff8b79697bc576ea5da49ecc936a5fd305a Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Thu, 26 Jul 2001 10:26:39 +0000 Subject: use the same symlink trick we just put int for .a, in the .la install case. --- include/builddefs.in | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/builddefs.in b/include/builddefs.in index 31088d7..14f465b 100644 --- a/include/builddefs.in +++ b/include/builddefs.in @@ -133,6 +133,9 @@ INSTALL_LTLIB = \ ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_SLIB_DIR) endif +# Libtool thinks the static and shared libs should be in the same dir, so +# make the static lib appear in the place we chose as rpath (using the two +# symlinks below). ifeq ($(ENABLE_SHARED),yes) INSTALL_LTLIB_DEV = \ cd $(TOPDIR)/$(LIBNAME)/.libs; \ @@ -141,7 +144,8 @@ INSTALL_LTLIB_DEV = \ ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \ ../$(INSTALL) -m 755 -d $(PKG_SLIB_DIR); \ ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_SLIB_DIR); \ - $(INSTALL_LTLIB_OLDLIB_SYMLINK) + ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_SLIB_DIR)/$(LIBNAME).a; \ + ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_SLIB_DIR)/$(LIBNAME).la else INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) endif @@ -151,11 +155,6 @@ INSTALL_LTLIB_STATIC = \ ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR) -# Libtool thinks the static and shared libs should be in the same dir, so -# make the static lib appear in the place we chose as rpath. -INSTALL_LTLIB_OLDLIB_SYMLINK = \ - ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_SLIB_DIR)/$(LIBNAME).a - INSTALL_MAN = \ @for d in $(MAN_PAGES); do \ first=true; \ -- cgit v1.2.3