From: Nathan Scott <nathans@sgi.com>
Date: Thu, 26 Jul 2001 10:26:39 +0000 (+0000)
Subject: use the same symlink trick we just put int for .a, in the .la install case.
X-Git-Tag: v2.0.0~75
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=761a38fe4cc8e982496752c93eee1a1a7f1a8d2b;p=thirdparty%2Fxfsprogs-dev.git

use the same symlink trick we just put int for .a, in the .la install case.
---

diff --git a/include/builddefs.in b/include/builddefs.in
index 2ee88003e..8e70560c0 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -140,6 +140,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; \
@@ -148,7 +151,9 @@ 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
@@ -158,11 +163,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; \