summaryrefslogtreecommitdiff
path: root/package/lvm
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-03-11 19:47:54 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-03-11 19:47:54 +0100
commit5c12e516831b195e3fd205b62b8a7f2bd3135157 (patch)
treef953ce51d1de02deecae1ad97940e50fe4f26a74 /package/lvm
parent7450887a788544eea0b0a7bbcfbe492d7afadad6 (diff)
parentd16059f43667b8801a0ed9c838a009ee9d571126 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/lvm')
-rw-r--r--package/lvm/patches/patch-libdm_Makefile_in25
1 files changed, 23 insertions, 2 deletions
diff --git a/package/lvm/patches/patch-libdm_Makefile_in b/package/lvm/patches/patch-libdm_Makefile_in
index 259f0f9d3..52a52a0fd 100644
--- a/package/lvm/patches/patch-libdm_Makefile_in
+++ b/package/lvm/patches/patch-libdm_Makefile_in
@@ -1,6 +1,27 @@
--- 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-03 19:48:02.316248648 +0100
-@@ -73,26 +73,32 @@ install: $(INSTALL_TYPE) install_include
++++ LVM2.2.02.61/libdm/Makefile.in 2010-03-08 06:27:03.000000000 +0100
+@@ -35,9 +35,7 @@ SOURCES =\
+
+ INCLUDES = -I$(srcdir)/$(interface) -I$(srcdir)
+
+-ifeq ("@STATIC_LINK@", "yes")
+ LIB_STATIC = $(interface)/libdevmapper.a
+-endif
+
+ ifeq ("@LIB_SUFFIX@","dylib")
+ LIB_SHARED = $(interface)/libdevmapper.dylib
+@@ -60,9 +58,7 @@ device-mapper: all
+
+ INSTALL_TYPE = install_dynamic
+
+-ifeq ("@STATIC_LINK@", "yes")
+- INSTALL_TYPE += install_static
+-endif
++INSTALL_TYPE += install_static
+
+ ifeq ("@PKGCONFIG@", "yes")
+ INSTALL_TYPE += install_pkgconfig
+@@ -73,26 +69,32 @@ install: $(INSTALL_TYPE) install_include
install_device-mapper: install
install_include: