diff options
| author | Nathan Scott <nathans@sgi.com> | 2001-07-26 10:26:39 +0000 |
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2001-07-26 10:26:39 +0000 |
| commit | a4c2be7d9132e27b3012306346cdb542c6a451f6 (patch) | |
| tree | 035e7366f9a387bf75acc8f7e5e1e164b2a6bba1 | |
| parent | 59ed3de391a0f0cf31245260eed5b94d2fdb1002 (diff) | |
| download | dmapi-dev-a4c2be7d9132e27b3012306346cdb542c6a451f6.tar.gz | |
use the same symlink trick we just put int for .a, in the .la install case.
| -rw-r--r-- | include/builddefs.in | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/include/builddefs.in b/include/builddefs.in index 7b32d65..9d9946d 100644 --- a/include/builddefs.in +++ b/include/builddefs.in @@ -131,6 +131,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; \ @@ -139,7 +142,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 @@ -149,11 +153,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; \ |