diff options
Diffstat (limited to 'package/lvm/patches/patch-tools_Makefile_in')
| -rw-r--r-- | package/lvm/patches/patch-tools_Makefile_in | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/package/lvm/patches/patch-tools_Makefile_in b/package/lvm/patches/patch-tools_Makefile_in index 9e420a8b7..9fc597990 100644 --- a/package/lvm/patches/patch-tools_Makefile_in +++ b/package/lvm/patches/patch-tools_Makefile_in @@ -1,6 +1,6 @@ ---- LVM2.2.02.168.orig/tools/Makefile.in 2016-12-01 00:17:32.000000000 +0100 -+++ LVM2.2.02.168/tools/Makefile.in 2017-03-28 03:03:30.000000000 +0200 -@@ -182,18 +182,22 @@ endif +--- LVM2.2.02.177.orig/tools/Makefile.in 2017-12-18 21:44:35.000000000 +0100 ++++ LVM2.2.02.177/tools/Makefile.in 2018-06-07 03:15:42.000000000 +0200 +@@ -217,18 +217,21 @@ endif install_dmsetup_dynamic install_dmsetup_static install_cmdlib_include: $(srcdir)/lvm2cmd.h @@ -10,15 +10,13 @@ install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX) - $(INSTALL_PROGRAM) -D $< $(libdir)/$(<F).$(LIB_VERSION) -+ $(INSTALL_DIR) $(libdir) -+ $(INSTALL_PROGRAM) $< $(libdir)/$(<F).$(LIB_VERSION) $(INSTALL_DIR) $(usrlibdir) ++ $(INSTALL_PROGRAM) $< $(libdir)/$(<F).$(LIB_VERSION) $(LN_S) -f $(USRLIB_RELPATH)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F) install_cmdlib_static: liblvm2cmd-static.a -- $(INSTALL_DATA) -D $< $(usrlibdir)/liblvm2cmd.a + $(INSTALL_DIR) $(usrlibdir) -+ $(INSTALL_DATA) $< $(usrlibdir)/liblvm2cmd.a + $(INSTALL_DATA) -D $< $(usrlibdir)/liblvm2cmd.a install_tools_dynamic: lvm .commands - $(INSTALL_PROGRAM) -D lvm $(sbindir)/lvm @@ -27,7 +25,7 @@ @echo Creating symbolic links for individual commands in $(sbindir) @for v in `cat .commands`; do \ echo "$(LN_S) -f lvm $(sbindir)/$$v"; \ -@@ -201,14 +205,17 @@ install_tools_dynamic: lvm .commands +@@ -236,14 +239,17 @@ install_tools_dynamic: lvm .commands done; install_tools_static: lvm.static @@ -45,6 +43,6 @@ - $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F) + $(INSTALL_DIR) $(staticdir) + $(INSTALL_PROGRAM) $< $(staticdir)/$(<F) - $(LN_S) -f $(<F) $(sbindir)/dmstats + $(LN_S) -f $(<F) $(staticdir)/dmstats install_device-mapper: $(INSTALL_DMSETUP_TARGETS) |