diff options
Diffstat (limited to 'package/lvm/patches/patch-libdm_Makefile_in')
| -rw-r--r-- | package/lvm/patches/patch-libdm_Makefile_in | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/package/lvm/patches/patch-libdm_Makefile_in b/package/lvm/patches/patch-libdm_Makefile_in index 02d029e48..52a52a0fd 100644 --- a/package/lvm/patches/patch-libdm_Makefile_in +++ b/package/lvm/patches/patch-libdm_Makefile_in @@ -1,41 +1,42 @@ -always install static library ---- LVM2.2.02.51.orig/libdm/Makefile.in 2009-04-08 16:04:35.000000000 +0200 -+++ LVM2.2.02.51/libdm/Makefile.in 2009-08-22 15:37:53.000000000 +0200 -@@ -34,9 +34,9 @@ SOURCES =\ +--- LVM2.2.02.61.orig/libdm/Makefile.in 2009-10-02 21:10:36.000000000 +0200 ++++ LVM2.2.02.61/libdm/Makefile.in 2010-03-08 06:27:03.000000000 +0100 +@@ -35,9 +35,7 @@ SOURCES =\ - INCLUDES = -I$(interface) -I. + INCLUDES = -I$(srcdir)/$(interface) -I$(srcdir) -ifeq ("@STATIC_LINK@", "yes") -+#ifeq ("@STATIC_LINK@", "yes") LIB_STATIC = $(interface)/libdevmapper.a -endif -+#endif ifeq ("@LIB_SUFFIX@","dylib") LIB_SHARED = $(interface)/libdevmapper.dylib -@@ -59,9 +59,9 @@ device-mapper: all +@@ -60,9 +58,7 @@ device-mapper: all INSTALL_TYPE = install_dynamic -ifeq ("@STATIC_LINK@", "yes") -+#ifeq ("@STATIC_LINK@", "yes") - INSTALL_TYPE += install_static +- INSTALL_TYPE += install_static -endif -+#endif ++INSTALL_TYPE += install_static ifeq ("@PKGCONFIG@", "yes") INSTALL_TYPE += install_pkgconfig -@@ -72,7 +72,8 @@ install: $(INSTALL_TYPE) install_include +@@ -73,26 +69,32 @@ install: $(INSTALL_TYPE) install_include install_device-mapper: install install_include: -- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper.h \ +- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/libdevmapper.h \ + $(INSTALL) -d $(includedir) -+ $(INSTALL) $(OWNER) $(GROUP) -m 444 libdevmapper.h \ ++ $(INSTALL) $(OWNER) $(GROUP) -m 444 $(srcdir)/libdevmapper.h \ $(includedir)/libdevmapper.h install_dynamic: install_@interface@ -@@ -83,15 +84,17 @@ install_static: install_@interface@_stat ++ $(INSTALL) -d $(libdir) + $(LN_S) -f libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION_DM) \ + $(libdir)/libdevmapper.$(LIB_SUFFIX) + + install_static: install_@interface@_static ++ $(INSTALL) -d $(libdir) $(LN_S) -f libdevmapper.a.$(LIB_VERSION_DM) $(libdir)/libdevmapper.a install_ioctl: ioctl/libdevmapper.$(LIB_SUFFIX) @@ -52,6 +53,7 @@ always install static library install_ioctl_static: ioctl/libdevmapper.a - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ ++ $(INSTALL) -d $(libdir) + $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ $(libdir)/libdevmapper.a.$(LIB_VERSION_DM) |