1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/patches/dmalloc/5.5.2/400-use_DESTDIR.patch	Fri May 18 15:57:16 2007 +0000
     1.3 @@ -0,0 +1,105 @@
     1.4 +Make install rules use DESTDIR.
     1.5 +Split installation of the utilitity from the global install.
     1.6 +
     1.7 +Copyright 2007 Yann E. MORIN <yann.morin.1998@anciens.enib.fr>
     1.8 +Licensed to you as dmalloc-5.5.2 is.
     1.9 +
    1.10 +diff -dur dmalloc-5.5.2.orig/Makefile.in dmalloc-5.5.2/Makefile.in
    1.11 +--- dmalloc-5.5.2.orig/Makefile.in	2007-05-18 16:03:31.000000000 +0200
    1.12 ++++ dmalloc-5.5.2/Makefile.in	2007-05-18 16:22:59.000000000 +0200
    1.13 +@@ -174,66 +174,67 @@
    1.14 + #	rm -f configure
    1.15 + 
    1.16 + installdirs :
    1.17 +-	$(srcdir)/mkinstalldirs $(includedir) $(libdir) $(bindir)
    1.18 ++	$(srcdir)/mkinstalldirs $(DESTDIR)/$(includedir) $(DESTDIR)/$(libdir) $(DESTDIR)/$(bindir)
    1.19 + 
    1.20 + installincs : $(HFLS)
    1.21 +-	$(srcdir)/mkinstalldirs $(includedir)
    1.22 +-	$(INSTALL_DATA) $(HFLS) $(includedir)
    1.23 ++	$(srcdir)/mkinstalldirs $(DESTDIR)/$(includedir)
    1.24 ++	$(INSTALL_DATA) $(HFLS) $(DESTDIR)/$(includedir)
    1.25 + 
    1.26 + installthsl : $(LIB_TH_SL)
    1.27 +-	$(srcdir)/mkinstalldirs $(libdir)
    1.28 +-	$(INSTALL_PROGRAM) $(LIB_TH_SL) $(libdir)
    1.29 ++	$(srcdir)/mkinstalldirs $(DESTDIR)/$(libdir)
    1.30 ++	$(INSTALL_PROGRAM) $(LIB_TH_SL) $(DESTDIR)/$(libdir)
    1.31 + 
    1.32 + installth : $(INSTALL_THREADS)
    1.33 +-	$(srcdir)/mkinstalldirs $(libdir)
    1.34 +-	$(INSTALL_PROGRAM) $(LIB_TH) $(libdir)
    1.35 ++	$(srcdir)/mkinstalldirs $(DESTDIR)/$(libdir)
    1.36 ++	$(INSTALL_PROGRAM) $(LIB_TH) $(DESTDIR)/$(libdir)
    1.37 + @CXX_OFF@	@echo "Enter 'make installthcxx' to install the threaded C++ library"
    1.38 + @SL_OFF@	@echo "Enter 'make installthsl' to install the threaded shared-library"
    1.39 + 
    1.40 + installthcxxsl : $(LIB_TH_CXX_SL)
    1.41 +-	$(srcdir)/mkinstalldirs $(shlibdir)
    1.42 +-	$(INSTALL_PROGRAM) $(LIB_TH_CXX_SL) $(shlibdir)
    1.43 ++	$(srcdir)/mkinstalldirs $(DESTDIR)/$(shlibdir)
    1.44 ++	$(INSTALL_PROGRAM) $(LIB_TH_CXX_SL) $(DESTDIR)/$(shlibdir)
    1.45 + 
    1.46 + installthcxx : $(INSTALL_TH_CXX)
    1.47 +-	$(srcdir)/mkinstalldirs $(libdir)
    1.48 +-	$(INSTALL_PROGRAM) $(LIB_TH_CXX) $(libdir)
    1.49 ++	$(srcdir)/mkinstalldirs $(DESTDIR)/$(libdir)
    1.50 ++	$(INSTALL_PROGRAM) $(LIB_TH_CXX) $(DESTDIR)/$(libdir)
    1.51 + @SL_OFF@	@echo "Enter 'make installthcxxsl' to install the threaded C++ shared-library"
    1.52 + 
    1.53 + installcxxsl : $(LIB_CXX_SL)
    1.54 +-	$(srcdir)/mkinstalldirs $(libdir)
    1.55 +-	$(INSTALL_PROGRAM) $(LIB_CXX_SL) $(libdir)
    1.56 ++	$(srcdir)/mkinstalldirs $(DESTDIR)/$(libdir)
    1.57 ++	$(INSTALL_PROGRAM) $(LIB_CXX_SL) $(DESTDIR)/$(libdir)
    1.58 + 
    1.59 + installcxx : $(INSTALL_CXX)
    1.60 +-	$(srcdir)/mkinstalldirs $(libdir)
    1.61 +-	$(INSTALL_PROGRAM) $(LIB_CXX) $(libdir)
    1.62 ++	$(srcdir)/mkinstalldirs $(DESTDIR)/$(libdir)
    1.63 ++	$(INSTALL_PROGRAM) $(LIB_CXX) $(DESTDIR)/$(libdir)
    1.64 + @TH_OFF@	@echo "Enter 'make installthcxx' to install the threaded C++ library"
    1.65 + @SL_OFF@	@echo "Enter 'make installcxxsl' to install the C++ shared-library"
    1.66 + 
    1.67 + installsl : $(LIB_SL)
    1.68 +-	$(srcdir)/mkinstalldirs $(shlibdir)
    1.69 +-	$(INSTALL_PROGRAM) $(LIB_SL) $(shlibdir)
    1.70 ++	$(srcdir)/mkinstalldirs $(DESTDIR)/$(shlibdir)
    1.71 ++	$(INSTALL_PROGRAM) $(LIB_SL) $(DESTDIR)/$(shlibdir)
    1.72 + @CXX_OFF@	@echo "Enter 'make installcxxsl' to install the C++ shared-library"
    1.73 + @TH_OFF@	@echo "Enter 'make installthsl' to install thread shared-library"
    1.74 + 
    1.75 + installlib : $(INSTALL_LIB)
    1.76 +-	$(srcdir)/mkinstalldirs $(libdir)
    1.77 +-	$(INSTALL_PROGRAM) $(LIBRARY) $(libdir)
    1.78 +-	@RANLIB@ $(libdir)/$(LIBRARY)
    1.79 ++	$(srcdir)/mkinstalldirs $(DESTDIR)/$(libdir)
    1.80 ++	$(INSTALL_PROGRAM) $(LIBRARY) $(DESTDIR)/$(libdir)
    1.81 ++	@RANLIB@ $(DESTDIR)/$(libdir)/$(LIBRARY)
    1.82 + @SL_OFF@	@echo "Enter 'make installsl' to install $(LIB_SL) in $(shlibdir)"
    1.83 + @CXX_OFF@	@echo "Enter 'make installcxx' to install the C++ library"
    1.84 + @TH_OFF@	@echo "Enter 'make installth' to install thread library"
    1.85 + 
    1.86 + installdocs : $(srcdir)/docs/$(HTMLFILE) $(srcdir)/docs/$(TEXIFILE) \
    1.87 + 		$(srcdir)/docs/$(PDFFILE)
    1.88 +-	$(srcdir)/mkinstalldirs $(docdir)
    1.89 +-	$(INSTALL_DATA) $(srcdir)/docs/$(HTMLFILE) $(docdir)
    1.90 +-	$(INSTALL_DATA) $(srcdir)/docs/$(TEXIFILE) $(docdir)
    1.91 +-	$(INSTALL_DATA) $(srcdir)/docs/$(PDFFILE) $(docdir)
    1.92 ++	$(srcdir)/mkinstalldirs $(DESTDIR)/$(docdir)
    1.93 ++	$(INSTALL_DATA) $(srcdir)/docs/$(HTMLFILE) $(DESTDIR)/$(docdir)
    1.94 ++	$(INSTALL_DATA) $(srcdir)/docs/$(TEXIFILE) $(DESTDIR)/$(docdir)
    1.95 ++	$(INSTALL_DATA) $(srcdir)/docs/$(PDFFILE) $(DESTDIR)/$(docdir)
    1.96 + 
    1.97 +-install : installincs installlib $(UTIL)
    1.98 +-	$(srcdir)/mkinstalldirs $(bindir)
    1.99 +-	$(INSTALL_PROGRAM) $(UTIL) $(bindir)
   1.100 +-	@echo "Enter 'make installdocs' to install $(DOCFILES) in $(docdir)"
   1.101 ++installutil : $(UTIL)
   1.102 ++	$(srcdir)/mkinstalldirs $(DESTDIR)/$(bindir)
   1.103 ++	$(INSTALL_PROGRAM) $(UTIL) $(DESTDIR)/$(bindir)
   1.104 ++
   1.105 ++install : installincs installlib installutil installdocs
   1.106 + 
   1.107 + dmalloc.h.2 : $(srcdir)/configure
   1.108 + 	$(SHELL) $(srcdir)/configure