35 lines
1.4 KiB
Text
35 lines
1.4 KiB
Text
|
$NetBSD: patch-ao,v 1.1 2010/10/12 16:43:00 joerg Exp $
|
||
|
|
|
||
|
|
--- include/buildmacros.orig 2010-10-12 16:28:00.000000000 +0000
|
||
|
|
+++ include/buildmacros
|
||
|
|
@@ -81,10 +81,7 @@ endif
|
||
|
|
|
||
|
|
ifeq ($(ENABLE_SHARED),yes)
|
||
|
|
INSTALL_LTLIB = \
|
||
|
|
- cd $(TOPDIR)/$(LIBNAME)/.libs; \
|
||
|
|
- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
|
||
|
|
- ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_LIB_DIR); \
|
||
|
|
- ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR)
|
||
|
|
+ ${BSD_INSTALL_LIB_DIR} $(PKG_LIB_DIR); libtool --mode=install ${BSD_INSTALL_LIB} $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(PKG_LIB_DIR)
|
||
|
|
endif
|
||
|
|
|
||
|
|
# Libtool thinks the static and shared libs should be in the same dir, so
|
||
|
|
@@ -94,16 +91,7 @@ endif
|
||
|
|
# link with the static libs there. So, another symlink to get the .so into
|
||
|
|
# /usr/lib.
|
||
|
|
ifeq ($(ENABLE_SHARED),yes)
|
||
|
|
-INSTALL_LTLIB_DEV = \
|
||
|
|
- cd $(TOPDIR)/$(LIBNAME)/.libs; \
|
||
|
|
- ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
|
||
|
|
- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR); \
|
||
|
|
- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
|
||
|
|
- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
|
||
|
|
- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
|
||
|
|
- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
|
||
|
|
- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
|
||
|
|
- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so
|
||
|
|
+INSTALL_LTLIB_DEV = :
|
||
|
|
else
|
||
|
|
INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
|
||
|
|
endif
|