150-use_DESTDIR.patch 4.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104
  1. Make install rules use DESTDIR.
  2. Split installation of the utilitity from the global install.
  3. Copyright 2007 Yann E. MORIN <yann.morin.1998@anciens.enib.fr>
  4. Licensed to you as dmalloc-5.5.2 is.
  5. Index: dmalloc-5.5.2/Makefile.in
  6. ===================================================================
  7. --- dmalloc-5.5.2.orig/Makefile.in
  8. +++ dmalloc-5.5.2/Makefile.in
  9. @@ -178,66 +178,66 @@ distclean : clean
  10. # rm -f configure
  11. installdirs :
  12. - $(srcdir)/mkinstalldirs $(includedir) $(libdir) $(bindir)
  13. + $(srcdir)/mkinstalldirs $(DESTDIR)/$(includedir) $(DESTDIR)/$(libdir) $(DESTDIR)/$(bindir)
  14. installincs : $(HFLS)
  15. - $(srcdir)/mkinstalldirs $(includedir)
  16. - $(INSTALL_DATA) $(HFLS) $(includedir)
  17. + $(srcdir)/mkinstalldirs $(DESTDIR)/$(includedir)
  18. + $(INSTALL_DATA) $(HFLS) $(DESTDIR)/$(includedir)
  19. installthsl : $(LIB_TH_SL)
  20. - $(srcdir)/mkinstalldirs $(shlibdir)
  21. - $(INSTALL) $(LIB_TH_SL) $(shlibdir)
  22. + $(srcdir)/mkinstalldirs $(DESTDIR)/$(shlibdir)
  23. + $(INSTALL) $(LIB_TH_SL) $(DESTDIR)/$(shlibdir)
  24. installth : $(INSTALL_THREADS)
  25. - $(srcdir)/mkinstalldirs $(libdir)
  26. - $(INSTALL) $(LIB_TH) $(libdir)
  27. + $(srcdir)/mkinstalldirs $(DESTDIR)/$(libdir)
  28. + $(INSTALL) $(LIB_TH) $(DESTDIR)/$(libdir)
  29. @CXX_OFF@ @echo "Enter 'make installthcxx' to install the threaded C++ library"
  30. @SL_OFF@ @echo "Enter 'make installthsl' to install the threaded shared-library"
  31. installthcxxsl : $(LIB_TH_CXX_SL)
  32. - $(srcdir)/mkinstalldirs $(shlibdir)
  33. - $(INSTALL) $(LIB_TH_CXX_SL) $(shlibdir)
  34. + $(srcdir)/mkinstalldirs $(DESTDIR)/$(shlibdir)
  35. + $(INSTALL) $(LIB_TH_CXX_SL) $(DESTDIR)/$(shlibdir)
  36. installthcxx : $(INSTALL_TH_CXX)
  37. - $(srcdir)/mkinstalldirs $(libdir)
  38. - $(INSTALL) $(LIB_TH_CXX) $(libdir)
  39. + $(srcdir)/mkinstalldirs $(DESTDIR)/$(libdir)
  40. + $(INSTALL) $(LIB_TH_CXX) $(DESTDIR)/$(libdir)
  41. @SL_OFF@ @echo "Enter 'make installthcxxsl' to install the threaded C++ shared-library"
  42. installcxxsl : $(LIB_CXX_SL)
  43. - $(srcdir)/mkinstalldirs $(shlibdir)
  44. - $(INSTALL) $(LIB_CXX_SL) $(shlibdir)
  45. + $(srcdir)/mkinstalldirs $(DESTDIR)/$(shlibdir)
  46. + $(INSTALL) $(LIB_CXX_SL) $(DESTDIR)/$(shlibdir)
  47. installcxx : $(INSTALL_CXX)
  48. - $(srcdir)/mkinstalldirs $(libdir)
  49. - $(INSTALL) $(LIB_CXX) $(libdir)
  50. + $(srcdir)/mkinstalldirs $(DESTDIR)/$(libdir)
  51. + $(INSTALL) $(LIB_CXX) $(DESTDIR)/$(libdir)
  52. @TH_OFF@ @echo "Enter 'make installthcxx' to install the threaded C++ library"
  53. @SL_OFF@ @echo "Enter 'make installcxxsl' to install the C++ shared-library"
  54. installsl : $(LIB_SL)
  55. - $(srcdir)/mkinstalldirs $(shlibdir)
  56. - $(INSTALL) $(LIB_SL) $(shlibdir)
  57. + $(srcdir)/mkinstalldirs $(DESTDIR)/$(shlibdir)
  58. + $(INSTALL) $(LIB_SL) $(DESTDIR)/$(shlibdir)
  59. @CXX_OFF@ @echo "Enter 'make installcxxsl' to install the C++ shared-library"
  60. @TH_OFF@ @echo "Enter 'make installthsl' to install thread shared-library"
  61. installlib : $(INSTALL_LIB)
  62. - $(srcdir)/mkinstalldirs $(libdir)
  63. - $(INSTALL) $(LIBRARY) $(libdir)
  64. - @RANLIB@ $(libdir)/$(LIBRARY)
  65. + $(srcdir)/mkinstalldirs $(DESTDIR)/$(libdir)
  66. + $(INSTALL) $(LIBRARY) $(DESTDIR)/$(libdir)
  67. + @RANLIB@ $(DESTDIR)/$(libdir)/$(LIBRARY)
  68. @SL_OFF@ @echo "Enter 'make installsl' to install $(LIB_SL) in $(shlibdir)"
  69. @CXX_OFF@ @echo "Enter 'make installcxx' to install the C++ library"
  70. @TH_OFF@ @echo "Enter 'make installth' to install thread library"
  71. installdocs : $(srcdir)/docs/$(HTMLFILE) $(srcdir)/docs/$(TEXIFILE) \
  72. $(srcdir)/docs/$(PDFFILE)
  73. - $(srcdir)/mkinstalldirs $(docdir)
  74. - $(INSTALL_DATA) $(srcdir)/docs/$(HTMLFILE) $(docdir)
  75. - $(INSTALL_DATA) $(srcdir)/docs/$(TEXIFILE) $(docdir)
  76. - $(INSTALL_DATA) $(srcdir)/docs/$(PDFFILE) $(docdir)
  77. + $(srcdir)/mkinstalldirs $(DESTDIR)/$(docdir)
  78. + $(INSTALL_DATA) $(srcdir)/docs/$(HTMLFILE) $(DESTDIR)/$(docdir)
  79. + $(INSTALL_DATA) $(srcdir)/docs/$(TEXIFILE) $(DESTDIR)/$(docdir)
  80. + $(INSTALL_DATA) $(srcdir)/docs/$(PDFFILE) $(DESTDIR)/$(docdir)
  81. install : installincs installlib $(UTIL)
  82. - $(srcdir)/mkinstalldirs $(bindir)
  83. - $(INSTALL_PROGRAM) $(UTIL) $(bindir)
  84. - @echo "Enter 'make installdocs' to install $(DOCFILES) in $(docdir)"
  85. + $(srcdir)/mkinstalldirs $(DESTDIR)/$(bindir)
  86. + $(INSTALL_PROGRAM) $(UTIL) $(DESTDIR)/$(bindir)
  87. + @echo "Enter 'make installdocs' to install $(DOCFILES) in $(DESTDIR)/$(docdir)"
  88. dmalloc.h.2 : $(srcdir)/configure
  89. $(SHELL) $(srcdir)/configure