]>
Commit | Line | Data |
---|---|---|
1 | diff -Nur blt2.4u.orig/Makefile.in blt2.4u/Makefile.in | |
2 | --- blt2.4u.orig/Makefile.in Thu May 18 02:00:14 2000 | |
3 | +++ blt2.4u/Makefile.in Wed Jan 3 19:41:25 2001 | |
4 | @@ -45,16 +45,16 @@ | |
5 | ||
6 | install-dirs: | |
7 | @for i in $(instdirs) ; do \ | |
8 | - if test ! -d $$i ; then \ | |
9 | - echo " mkdir $$i" ; \ | |
10 | - mkdir $$i ; \ | |
11 | + if test ! -d $(DESTDIR)$$i ; then \ | |
12 | + echo " mkdir $(DESTDIR)$$i" ; \ | |
13 | + mkdir $(DESTDIR)$$i ; \ | |
14 | fi ; \ | |
15 | done | |
16 | ||
17 | install-readme: | |
18 | - $(INSTALL_DATA) $(srcdir)/README $(scriptdir) | |
19 | - $(INSTALL_DATA) $(srcdir)/PROBLEMS $(scriptdir) | |
20 | - $(INSTALL_DATA) $(srcdir)/NEWS $(scriptdir) | |
21 | + $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(scriptdir) | |
22 | + $(INSTALL_DATA) $(srcdir)/PROBLEMS $(DESTDIR)$(scriptdir) | |
23 | + $(INSTALL_DATA) $(srcdir)/NEWS $(DESTDIR)$(scriptdir) | |
24 | ||
25 | clean: | |
26 | (cd src; $(MAKE) clean) | |
27 | diff -Nur blt2.4u.orig/demos/Makefile.in blt2.4u/demos/Makefile.in | |
28 | --- blt2.4u.orig/demos/Makefile.in Fri Jun 23 02:40:05 2000 | |
29 | +++ blt2.4u/demos/Makefile.in Wed Jan 3 19:41:25 2001 | |
30 | @@ -46,31 +46,31 @@ | |
31 | ||
32 | inst-scripts: | |
33 | for i in $(srcdir)/scripts/*.tcl ; do \ | |
34 | - $(INSTALL) $$i $(destdir)/scripts ; \ | |
35 | + $(INSTALL) $$i $(DESTDIR)$(destdir)/scripts ; \ | |
36 | done | |
37 | for i in $(demos) ; do \ | |
38 | - $(INSTALL) $(srcdir)/$$i $(destdir)/$$i ; \ | |
39 | + $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(destdir)/$$i ; \ | |
40 | done | |
41 | ||
42 | inst-bitmaps: | |
43 | for i in $(srcdir)/bitmaps/*.xbm ; do \ | |
44 | - $(INSTALL_DATA) $$i $(destdir)/bitmaps ; \ | |
45 | + $(INSTALL_DATA) $$i $(DESTDIR)$(destdir)/bitmaps ; \ | |
46 | done | |
47 | for i in $(srcdir)/bitmaps/hand/*.xbm ; do \ | |
48 | - $(INSTALL_DATA) $$i $(destdir)/bitmaps/hand ; \ | |
49 | + $(INSTALL_DATA) $$i $(DESTDIR)$(destdir)/bitmaps/hand ; \ | |
50 | done | |
51 | for i in $(srcdir)/bitmaps/fish/*.xbm ; do \ | |
52 | - $(INSTALL_DATA) $$i $(destdir)/bitmaps/fish ; \ | |
53 | + $(INSTALL_DATA) $$i $(DESTDIR)$(destdir)/bitmaps/fish ; \ | |
54 | done | |
55 | ||
56 | inst-images: | |
57 | for i in $(srcdir)/images/*.gif $(srcdir)/images/*.ps ; do \ | |
58 | - $(INSTALL_DATA) $$i $(destdir)/images ; \ | |
59 | + $(INSTALL_DATA) $$i $(DESTDIR)$(destdir)/images ; \ | |
60 | done | |
61 | ||
62 | inst-dirs: | |
63 | @for i in $(instdirs) ; do \ | |
64 | - if test -d "$$i" ; then : ; else mkdir "$$i" ; fi ; \ | |
65 | + if test -d "$(DESTDIR)$$i" ; then : ; else mkdir "$(DESTDIR)$$i" ; fi ; \ | |
66 | done | |
67 | ||
68 | clean: | |
69 | diff -Nur blt2.4u.orig/library/Makefile.in blt2.4u/library/Makefile.in | |
70 | --- blt2.4u.orig/library/Makefile.in Fri May 5 06:49:36 2000 | |
71 | +++ blt2.4u/library/Makefile.in Wed Jan 3 19:41:25 2001 | |
72 | @@ -32,21 +32,21 @@ | |
73 | ||
74 | mkdirs: | |
75 | @for i in $(instdirs) ; do \ | |
76 | - if test -d $$i ; then : ; else mkdir $$i ; fi ; \ | |
77 | + if test -d $(DESTDIR)$$i ; then : ; else mkdir $(DESTDIR)$$i ; fi ; \ | |
78 | done | |
79 | ||
80 | dragdrop: mkdirs | |
81 | for i in $(ddFiles) ; do \ | |
82 | - $(INSTALL_DATA) $(srcdir)/dd_protocols/$$i $(scriptdir)/dd_protocols ; \ | |
83 | + $(INSTALL_DATA) $(srcdir)/dd_protocols/$$i $(DESTDIR)$(scriptdir)/dd_protocols ; \ | |
84 | done | |
85 | ||
86 | files: mkdirs | |
87 | for i in $(miscFiles) ; do \ | |
88 | - $(INSTALL_DATA) $(srcdir)/$$i $(scriptdir) ; \ | |
89 | + $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(scriptdir) ; \ | |
90 | done | |
91 | ||
92 | package: mkdirs pkgIndex.tcl | |
93 | - $(INSTALL_DATA) pkgIndex.tcl $(scriptdir) | |
94 | + $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(scriptdir) | |
95 | ||
96 | pkgIndex: | |
97 | rm -f pkgIndex.tcl | |
98 | diff -Nur blt2.4u.orig/man/Makefile.in blt2.4u/man/Makefile.in | |
99 | --- blt2.4u.orig/man/Makefile.in Tue Feb 8 22:40:26 2000 | |
100 | +++ blt2.4u/man/Makefile.in Wed Jan 3 19:43:14 2001 | |
101 | @@ -28,13 +28,13 @@ | |
102 | ||
103 | install-manuals: $(MANPAGES) | |
104 | for i in *.n ; do \ | |
105 | - $(INSTALL_DATA) $$i $(sectiondir); \ | |
106 | + $(INSTALL_DATA) $$i $(DESTDIR)$(sectiondir); \ | |
107 | done | |
108 | ||
109 | install-dirs: | |
110 | @for i in $(instdirs) ; do \ | |
111 | - if test ! -d $$i ; then \ | |
112 | - mkdir $$i ; \ | |
113 | + if test ! -d $(DESTDIR)$$i ; then \ | |
114 | + mkdir -p $(DESTDIR)$$i ; \ | |
115 | fi ; \ | |
116 | done | |
117 | ||
118 | diff -Nur blt2.4u.orig/src/Makefile.in blt2.4u/src/Makefile.in | |
119 | --- blt2.4u.orig/src/Makefile.in Fri May 5 06:49:36 2000 | |
120 | +++ blt2.4u/src/Makefile.in Wed Jan 3 19:41:25 2001 | |
121 | @@ -143,30 +143,30 @@ | |
122 | install: install_dirs install_lib install_demo install_headers | |
123 | ||
124 | install_demo: $(bltwish) $(bltsh) | |
125 | - $(INSTALL) -m 0755 $(bltwish) $(bindir) | |
126 | - $(INSTALL) -m 0755 $(bltsh) $(bindir) | |
127 | + $(INSTALL) -m 0755 $(bltwish) $(DESTDIR)$(bindir) | |
128 | + $(INSTALL) -m 0755 $(bltsh) $(DESTDIR)$(bindir) | |
129 | ||
130 | install_lib: $(lib_a) | |
131 | - $(INSTALL_DATA) $(lib_a) $(libdir)/$(libvers_a) | |
132 | - (cd $(libdir); $(RM) $(lib_a) ; $(LN_S) $(libvers_a) $(lib_a)) | |
133 | - $(RANLIB) $(libdir)/$(libvers_a) | |
134 | - $(INSTALL_DATA) $(tcl_only_lib_a) $(libdir)/$(tcl_only_libvers_a) | |
135 | - (cd $(libdir); $(RM) $(tcl_only_lib_a) ; $(LN_S) $(tcl_only_libvers_a) $(tcl_only_lib_a)) | |
136 | - $(RANLIB) $(libdir)/$(tcl_only_libvers_a) | |
137 | + $(INSTALL_DATA) $(lib_a) $(DESTDIR)$(libdir)/$(libvers_a) | |
138 | + (cd $(DESTDIR)$(libdir); $(RM) $(lib_a) ; $(LN_S) $(libvers_a) $(lib_a)) | |
139 | + $(RANLIB) $(DESTDIR)$(libdir)/$(libvers_a) | |
140 | + $(INSTALL_DATA) $(tcl_only_lib_a) $(DESTDIR)$(libdir)/$(tcl_only_libvers_a) | |
141 | + (cd $(DESTDIR)$(libdir); $(RM) $(tcl_only_lib_a) ; $(LN_S) $(tcl_only_libvers_a) $(tcl_only_lib_a)) | |
142 | + $(RANLIB) $(DESTDIR)$(libdir)/$(tcl_only_libvers_a) | |
143 | (cd shared; $(MAKE) install) | |
144 | ||
145 | install_dirs: | |
146 | @for i in $(instdirs) ; do \ | |
147 | - if test ! -d $$i ; then \ | |
148 | - echo " mkdir $$i" ; \ | |
149 | - mkdir $$i ; \ | |
150 | + if test ! -d $(DESTDIR)$$i ; then \ | |
151 | + echo " mkdir $(DESTDIR)$$i" ; \ | |
152 | + mkdir $(DESTDIR)$$i ; \ | |
153 | fi ; \ | |
154 | done | |
155 | ||
156 | install_headers: | |
157 | @for i in $(headers) ; do \ | |
158 | - echo "installing $(incdir)/$$i..." ; \ | |
159 | - $(INSTALL_DATA) -m 0444 $(srcdir)/$$i $(incdir) ; \ | |
160 | + echo "installing $(DESTDIR)$(incdir)/$$i..." ; \ | |
161 | + $(INSTALL_DATA) -m 0444 $(srcdir)/$$i $(DESTDIR)$(incdir) ; \ | |
162 | done | |
163 | ||
164 | lint: | |
165 | diff -Nur blt2.4u.orig/src/shared/Makefile.in blt2.4u/src/shared/Makefile.in | |
166 | --- blt2.4u.orig/src/shared/Makefile.in Fri Jun 23 02:40:06 2000 | |
167 | +++ blt2.4u/src/shared/Makefile.in Wed Jan 3 19:41:25 2001 | |
168 | @@ -124,18 +124,18 @@ | |
169 | install: install_dirs install_lib install_demo | |
170 | ||
171 | install_demo: $(bltwish) | |
172 | - $(INSTALL) -m 0755 bltwish$(version) $(bindir) | |
173 | - $(INSTALL) -m 0755 bltsh$(version) $(bindir) | |
174 | + $(INSTALL) -m 0755 bltwish$(version) $(DESTDIR)$(bindir) | |
175 | + $(INSTALL) -m 0755 bltsh$(version) $(DESTDIR)$(bindir) | |
176 | ||
177 | install_lib: $(lib_so) | |
178 | - $(INSTALL) -m 0755 $(lib_so) $(libdir) | |
179 | - $(INSTALL) -m 0755 $(tcl_only_lib_so) $(libdir) | |
180 | + $(INSTALL) -m 0755 $(lib_so) $(DESTDIR)$(libdir) | |
181 | + $(INSTALL) -m 0755 $(tcl_only_lib_so) $(DESTDIR)$(libdir) | |
182 | ||
183 | install_dirs: | |
184 | @for i in $(instdirs) ; do \ | |
185 | - if test ! -d $$i ; then \ | |
186 | - echo " mkdir $$i" ; \ | |
187 | - mkdir $$i ; \ | |
188 | + if test ! -d $(DESTDIR)$$i ; then \ | |
189 | + echo " mkdir $(DESTDIR)$$i" ; \ | |
190 | + mkdir $(DESTDIR)$$i ; \ | |
191 | fi ; \ | |
192 | done | |
193 |