summaryrefslogtreecommitdiff
path: root/package/lvm/patches/patch-tools_Makefile_in
diff options
context:
space:
mode:
Diffstat (limited to 'package/lvm/patches/patch-tools_Makefile_in')
-rw-r--r--package/lvm/patches/patch-tools_Makefile_in37
1 files changed, 16 insertions, 21 deletions
diff --git a/package/lvm/patches/patch-tools_Makefile_in b/package/lvm/patches/patch-tools_Makefile_in
index 8d6e49a3f..ae6fcbf8f 100644
--- a/package/lvm/patches/patch-tools_Makefile_in
+++ b/package/lvm/patches/patch-tools_Makefile_in
@@ -1,33 +1,28 @@
---- LVM2.2.02.51.orig/tools/Makefile.in Thu May 21 13:11:29 2009
-+++ LVM2.2.02.51/tools/Makefile.in Mon Feb 15 23:30:04 2010
-@@ -137,7 +137,7 @@ liblvm2cmd.$(LIB_SUFFIX): liblvm2cmd.a $(LDDEPS)
-
- .commands: commands.h cmdnames.h Makefile
- $(CC) -E -P cmdnames.h 2> /dev/null | \
-- egrep -v '^ *(|#.*|dumpconfig|formats|help|pvdata|segtypes|version) *$$' > .commands
-+ egrep -v '^ *\(|#.*|dumpconfig|formats|help|pvdata|segtypes|version\) *$$' > .commands
-
- .PHONY: install_cmdlib_dynamic install_cmdlib_static \
- install_tools_dynamic install_tools_static
-@@ -160,21 +160,24 @@ cflow: lvm.cflow lvm.xref lvm.tree lvm.rtree lvm.rxref
+--- LVM2.2.02.61.orig/tools/Makefile.in 2010-01-19 02:10:47.000000000 +0100
++++ LVM2.2.02.61/tools/Makefile.in 2010-03-03 19:46:06.396138753 +0100
+@@ -165,21 +165,26 @@ cflow: lvm.cflow lvm.xref lvm.tree lvm.r
endif
install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX)
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.$(LIB_SUFFIX) \
+- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
+ $(INSTALL) -d $(libdir)
-+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.$(LIB_SUFFIX) \
++ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
$(libdir)/liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION)
$(LN_S) -f liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION) $(libdir)/liblvm2cmd.$(LIB_SUFFIX)
- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \
+- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
++ $(INSTALL) -d $(includedir)
++ $(INSTALL) $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
$(includedir)/lvm2cmd.h
install_cmdlib_static: liblvm2cmd-static.a
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd-static.a \
+- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
+ $(INSTALL) -d $(libdir)
-+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd-static.a \
++ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
$(libdir)/liblvm2cmd.a.$(LIB_VERSION)
$(LN_S) -f liblvm2cmd.a.$(LIB_VERSION) $(libdir)/liblvm2cmd.a
- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \
+- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
++ $(INSTALL) -d $(includedir)
++ $(INSTALL) $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
$(includedir)/lvm2cmd.h
install_tools_dynamic: lvm .commands
@@ -37,13 +32,13 @@
$(sbindir)/lvm
@echo Creating symbolic links for individual commands in $(sbindir)
@( \
-@@ -185,14 +188,17 @@ install_tools_dynamic: lvm .commands
+@@ -190,14 +195,17 @@ install_tools_dynamic: lvm .commands
)
install_tools_static: lvm.static
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \
+- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
+ $(INSTALL) -d $(sbindir)
-+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \
++ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
$(staticdir)/lvm.static
install_dmsetup_dynamic: dmsetup