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