diff options
| author | Dean Roehrich <roehrich@sgi.com> | 2001-07-24 20:22:44 +0000 |
|---|---|---|
| committer | Dean Roehrich <roehrich@sgi.com> | 2001-07-24 20:22:44 +0000 |
| commit | da25242b7d7ae538b515844cc79a24be734a9b83 (patch) | |
| tree | 5215561de7273ac9e21342c56789ab8c24c87312 /include | |
| parent | 7523383b44f4ff9c472887526c1a5e8136ea7d6d (diff) | |
| download | attr-da25242b7d7ae538b515844cc79a24be734a9b83.tar.gz | |
fix the AC_ARG_ENABLE macro for --enable-shared.
Diffstat (limited to 'include')
| -rw-r--r-- | include/builddefs.in | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/builddefs.in b/include/builddefs.in index 912d02e..9cfc5e7 100644 --- a/include/builddefs.in +++ b/include/builddefs.in @@ -128,7 +128,7 @@ ifeq ($(ENABLE_SHARED),yes) INSTALL_LTLIB = \ cd $(TOPDIR)/$(LIBNAME)/.libs; \ ../$(INSTALL) -m 755 -d $(PKG_SLIB_DIR); \ - ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_SLIB_DIR); \ + ../$(INSTALL) -m 755 -T so_dot_version $(LIBNAME).lai $(PKG_SLIB_DIR); \ test "$(PKG_DISTRIBUTION)" = debian || \ ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_SLIB_DIR) endif @@ -140,7 +140,8 @@ INSTALL_LTLIB_DEV = \ ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \ ../$(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) -T so_base $(LIBNAME).lai $(PKG_SLIB_DIR); \ + $(INSTALL_LTLIB_OLDLIB_SYMLINK) else INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) endif @@ -150,6 +151,11 @@ 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; \ |