r851 - lvm2/trunk/debian/patches

[Bastian Blank]

Author: waldi
Date: Mon Feb 21 21:53:33 2011
New Revision: 851

Log:
debian/patches/install.patch: Simplify symlink fix.

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

Modified: lvm2/trunk/debian/patches/install.patch
==============================================================================
--- lvm2/trunk/debian/patches/install.patch	Mon Feb 21 21:31:02 2011	(r850)
+++ lvm2/trunk/debian/patches/install.patch	Mon Feb 21 21:53:33 2011	(r851)
@@ -8,7 +8,17 @@
  MKDIR_P = @MKDIR_P@
  MSGFMT = @MSGFMT@
  LCOV = @LCOV@
-@@ -92,22 +93,14 @@
+@@ -67,8 +68,7 @@
+ initdir = $(DESTDIR)@sysconfdir@/rc.d/init.d
+ ocf_scriptdir = $(DESTDIR)@OCFDIR@
+ 
+-USRLIB_RELPATH = $(shell echo $(abspath $(usrlibdir) $(libdir)) | \
+-  $(AWK) -f $(top_srcdir)/scripts/relpath.awk)
++USRLIB_RELPATH = $(libdir)
+ 
+ DEFAULT_SYS_DIR = @DEFAULT_SYS_DIR@
+ DEFAULT_ARCHIVE_DIR = $(DEFAULT_SYS_DIR)/@DEFAULT_ARCHIVE_SUBDIR@
+@@ -92,22 +92,14 @@
  endif
  
  # Handle installation of files
@@ -35,23 +45,3 @@
  
  .SUFFIXES: .c .d .o .so .a .po .pot .mo .dylib
  
-@@ -324,7 +317,7 @@
- install_lib_shared: $(LIB_SHARED)
- 	$(INSTALL_PROGRAM) -D $< $(libdir)/$(<F).$(LIB_VERSION)
- 	$(INSTALL_DIR) $(usrlibdir)
--	$(LN_S) -f $(USRLIB_RELPATH)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F)
-+	$(LN_S) -f @libdir@/$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F)
- 
- # FIXME: plugins are installed to subdirs 
- #        and for compatibility links in libdir are created
---- a/tools/Makefile.in
-+++ b/tools/Makefile.in
-@@ -174,7 +174,7 @@
- install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX)
- 	$(INSTALL_PROGRAM) -D $< $(libdir)/$(<F).$(LIB_VERSION)
- 	$(INSTALL_DIR) $(usrlibdir)
--	$(LN_S) -f $(USRLIB_RELPATH)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F)
-+	$(LN_S) -f $(libdir)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F)
- 
- install_cmdlib_static: liblvm2cmd-static.a
- 	$(INSTALL_DATA) -D $< $(usrlibdir)/liblvm2cmd.a