diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-08-22 23:49:52 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-08-22 23:49:52 +0200 |
| commit | 54893039866e0978bd6563e2b7361f7736341163 (patch) | |
| tree | f757d7250af9964234530e8d7f480951ab63c7aa /package/lvm/patches/patch-libdm_Makefile_in | |
| parent | 2c84de509054d770081084ca223f55b67ef945db (diff) | |
| parent | ba0c06d2bb46e087f1782eb76573e0bef735c062 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/lvm/patches/patch-libdm_Makefile_in')
| -rw-r--r-- | package/lvm/patches/patch-libdm_Makefile_in | 33 |
1 files changed, 29 insertions, 4 deletions
diff --git a/package/lvm/patches/patch-libdm_Makefile_in b/package/lvm/patches/patch-libdm_Makefile_in index c6d63a3fe..02d029e48 100644 --- a/package/lvm/patches/patch-libdm_Makefile_in +++ b/package/lvm/patches/patch-libdm_Makefile_in @@ -1,6 +1,31 @@ ---- LVM2.2.02.45.orig/libdm/Makefile.in 2008-11-14 21:59:56.000000000 +0100 -+++ LVM2.2.02.45/libdm/Makefile.in 2009-06-11 23:26:48.000000000 +0200 -@@ -70,7 +70,8 @@ install: $(INSTALL_TYPE) install_include +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 =\ + + INCLUDES = -I$(interface) -I. + +-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 + + INSTALL_TYPE = install_dynamic + +-ifeq ("@STATIC_LINK@", "yes") ++#ifeq ("@STATIC_LINK@", "yes") + INSTALL_TYPE += install_static +-endif ++#endif + + ifeq ("@PKGCONFIG@", "yes") + INSTALL_TYPE += install_pkgconfig +@@ -72,7 +72,8 @@ install: $(INSTALL_TYPE) install_include install_device-mapper: install install_include: @@ -10,7 +35,7 @@ $(includedir)/libdevmapper.h install_dynamic: install_@interface@ -@@ -81,15 +82,17 @@ install_static: install_@interface@_stat +@@ -83,15 +84,17 @@ install_static: install_@interface@_stat $(LN_S) -f libdevmapper.a.$(LIB_VERSION_DM) $(libdir)/libdevmapper.a install_ioctl: ioctl/libdevmapper.$(LIB_SUFFIX) |