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