1
0

patch-tools_Makefile_in 2.1 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758
  1. --- LVM2.2.02.79.orig/tools/Makefile.in 2010-10-15 11:41:21.000000000 +0200
  2. +++ LVM2.2.02.79/tools/Makefile.in 2010-12-26 22:15:11.000000000 +0100
  3. @@ -158,7 +158,7 @@ liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION):
  4. .commands: $(srcdir)/commands.h $(srcdir)/cmdnames.h Makefile
  5. $(CC) -E -P $(srcdir)/cmdnames.h 2> /dev/null | \
  6. - egrep -v '^ *(|#.*|dumpconfig|formats|help|pvdata|segtypes|version) *$$' > .commands
  7. + egrep -v '^ *(#.*|dumpconfig|formats|help|pvdata|segtypes|version) *$$' > .commands
  8. ifneq ("$(CFLOW_CMD)", "")
  9. CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES))
  10. @@ -171,18 +171,22 @@ endif
  11. install_dmsetup_dynamic install_dmsetup_static
  12. install_cmdlib_include: $(srcdir)/lvm2cmd.h
  13. - $(INSTALL_DATA) -D $< $(includedir)/$(<F)
  14. + $(INSTALL_DIR) $(includedir)
  15. + $(INSTALL_DATA) $< $(includedir)/$(<F)
  16. install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX)
  17. - $(INSTALL_PROGRAM) -D $< $(libdir)/$(<F).$(LIB_VERSION)
  18. + $(INSTALL_DIR) $(libdir)
  19. + $(INSTALL_PROGRAM) $< $(libdir)/$(<F).$(LIB_VERSION)
  20. $(INSTALL_DIR) $(usrlibdir)
  21. $(LN_S) -f $(USRLIB_RELPATH)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F)
  22. install_cmdlib_static: liblvm2cmd-static.a
  23. - $(INSTALL_DATA) -D $< $(usrlibdir)/liblvm2cmd.a
  24. + $(INSTALL_DIR) $(usrlibdir)
  25. + $(INSTALL_DATA) $< $(usrlibdir)/liblvm2cmd.a
  26. install_tools_dynamic: lvm .commands
  27. - $(INSTALL_PROGRAM) -D lvm $(sbindir)/lvm
  28. + $(INSTALL_DIR) $(sbindir)
  29. + $(INSTALL_PROGRAM) lvm $(sbindir)/lvm
  30. @echo Creating symbolic links for individual commands in $(sbindir)
  31. @for v in `cat .commands`; do \
  32. echo "$(LN_S) -f lvm $(sbindir)/$$v"; \
  33. @@ -190,13 +194,16 @@ install_tools_dynamic: lvm .commands
  34. done;
  35. install_tools_static: lvm.static
  36. - $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F)
  37. + $(INSTALL_DIR) $(staticdir)
  38. + $(INSTALL_PROGRAM) $< $(staticdir)/$(<F)
  39. install_dmsetup_dynamic: dmsetup
  40. - $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F)
  41. + $(INSTALL_DIR) $(sbindir)
  42. + $(INSTALL_PROGRAM) $< $(sbindir)/$(<F)
  43. install_dmsetup_static: dmsetup.static
  44. - $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F)
  45. + $(INSTALL_DIR) $(staticdir)
  46. + $(INSTALL_PROGRAM) $< $(staticdir)/$(<F)
  47. install_device-mapper: $(INSTALL_DMSETUP_TARGETS)