Merge from vendor branch TNF:
[pkgsrcv2.git] / sysutils / xfsprogs / patches / patch-ao
1 $NetBSD$
2
3 --- include/buildmacros.orig    2010-10-12 16:28:00.000000000 +0000
4 +++ include/buildmacros
5 @@ -81,10 +81,7 @@ endif
6  
7  ifeq ($(ENABLE_SHARED),yes)
8  INSTALL_LTLIB = \
9 -       cd $(TOPDIR)/$(LIBNAME)/.libs; \
10 -       ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
11 -       ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_LIB_DIR); \
12 -       ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR)
13 +       ${BSD_INSTALL_LIB_DIR} $(PKG_LIB_DIR); libtool --mode=install ${BSD_INSTALL_LIB} $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(PKG_LIB_DIR)
14  endif
15  
16  # Libtool thinks the static and shared libs should be in the same dir, so
17 @@ -94,16 +91,7 @@ endif
18  # link with the static libs there.  So, another symlink to get the .so into
19  # /usr/lib.
20  ifeq ($(ENABLE_SHARED),yes)
21 -INSTALL_LTLIB_DEV = \
22 -       cd $(TOPDIR)/$(LIBNAME)/.libs; \
23 -       ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
24 -       ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR); \
25 -       ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
26 -       ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
27 -       ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
28 -       ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
29 -       ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
30 -       ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so
31 +INSTALL_LTLIB_DEV = :
32  else
33  INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
34  endif