r657 - lvm2/trunk/debian/patches

[Bastian Blank]

Author: waldi
Date: Mon Feb 23 01:52:00 2009
New Revision: 657

Log:
debian/patches/install.patch: Fix installation of libdevmapper.


Modified:
   lvm2/trunk/debian/patches/install.patch

Modified: lvm2/trunk/debian/patches/install.patch
==============================================================================
--- lvm2/trunk/debian/patches/install.patch	(original)
+++ lvm2/trunk/debian/patches/install.patch	Mon Feb 23 01:52:00 2009
@@ -175,8 +175,11 @@
  		$(includedir)/libdevmapper.h
  
  install_dynamic: install_ at interface@
-@@ -81,15 +77,15 @@
- 	$(LN_S) -f libdevmapper.a.$(LIB_VERSION_DM) $(libdir)/libdevmapper.a
+@@ -78,19 +74,17 @@
+ 		$(libdir)/libdevmapper.$(LIB_SUFFIX)
+ 
+ install_static: install_ at interface@_static
+-	$(LN_S) -f libdevmapper.a.$(LIB_VERSION_DM) $(libdir)/libdevmapper.a
  
  install_ioctl: ioctl/libdevmapper.$(LIB_SUFFIX)
 -	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
@@ -190,10 +193,11 @@
  
  install_ioctl_static: ioctl/libdevmapper.a
 -	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-+	$(INSTALL) -D $< \
- 		$(libdir)/libdevmapper.a.$(LIB_VERSION_DM)
+-		$(libdir)/libdevmapper.a.$(LIB_VERSION_DM)
++	$(INSTALL) -D $< $(usrlibdir)/libdevmapper.a
  
  $(VERSIONED_SHLIB): %.$(LIB_SUFFIX).$(LIB_VERSION_DM): $(interface)/%.$(LIB_SUFFIX)
+ 	rm -f $@
 --- a/daemons/dmeventd/Makefile.in
 +++ b/daemons/dmeventd/Makefile.in
 @@ -64,25 +64,21 @@