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