patch-tools_Makefile_in 1.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657
  1. $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  2. --- LVM2.2.02.45.orig/tools/Makefile.in 2009-02-17 12:07:59.000000000 +0100
  3. +++ LVM2.2.02.45/tools/Makefile.in 2009-06-11 23:24:12.000000000 +0200
  4. @@ -62,19 +62,18 @@ SOURCES =\
  5. vgscan.c \
  6. vgsplit.c
  7. -TARGETS =\
  8. - .commands \
  9. - lvm
  10. -
  11. -INSTALL_LVM_TARGETS = install_tools_dynamic
  12. -INSTALL_DMSETUP_TARGETS = install_dmsetup_dynamic
  13. -INSTALL_CMDLIB_TARGETS = install_cmdlib_dynamic
  14. +TARGETS = .commands
  15. ifeq ("@STATIC_LINK@", "yes")
  16. TARGETS += lvm.static
  17. INSTALL_LVM_TARGETS += install_tools_static
  18. INSTALL_DMSETUP_TARGETS += install_dmsetup_static
  19. INSTALL_CMDLIB_TARGETS += install_cmdlib_static
  20. +else
  21. + TARGETS += lvm
  22. + INSTALL_LVM_TARGETS = install_tools_dynamic
  23. + INSTALL_DMSETUP_TARGETS = install_dmsetup_dynamic
  24. + INSTALL_CMDLIB_TARGETS = install_cmdlib_dynamic
  25. endif
  26. LVMLIBS = -llvm
  27. @@ -170,7 +169,8 @@ install_cmdlib_static: liblvm2cmd-static
  28. $(includedir)/lvm2cmd.h
  29. install_tools_dynamic: lvm .commands
  30. - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm \
  31. + $(INSTALL) -d $(sbindir)
  32. + $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) lvm \
  33. $(sbindir)/lvm
  34. @echo Creating symbolic links for individual commands in $(sbindir)
  35. @( \
  36. @@ -181,14 +181,14 @@ install_tools_dynamic: lvm .commands
  37. )
  38. install_tools_static: lvm.static
  39. - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \
  40. + $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \
  41. $(staticdir)/lvm.static
  42. install_dmsetup_dynamic: dmsetup
  43. - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
  44. + $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
  45. install_dmsetup_static: dmsetup.static
  46. - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
  47. + $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
  48. install_device-mapper: $(INSTALL_DMSETUP_TARGETS)