1 | #! /bin/sh /usr/share/dpatch/dpatch-run |
---|
2 | ## libdir.dpatch by Bastian Blank <waldi@debian.org> |
---|
3 | ## Forward ported to xen 3.0.2 by Guido Trotter <ultrotter@debian.org> |
---|
4 | ## |
---|
5 | ## All lines beginning with `## DP:' are a description of the patch. |
---|
6 | ## DP: No description. |
---|
7 | |
---|
8 | @DPATCH@ |
---|
9 | diff -urNad xen-3.1.0-src~/Config.mk xen-3.1.0-src/Config.mk |
---|
10 | --- xen-3.1.0-src~/Config.mk 2007-05-18 16:45:21.000000000 +0200 |
---|
11 | +++ xen-3.1.0-src/Config.mk 2007-06-19 21:50:09.205477427 +0200 |
---|
12 | @@ -26,6 +26,10 @@ |
---|
13 | include $(XEN_ROOT)/config/$(XEN_OS).mk |
---|
14 | include $(XEN_ROOT)/config/$(XEN_TARGET_ARCH).mk |
---|
15 | |
---|
16 | +PREFIX = lib/xen-$(XEN_VERSION) |
---|
17 | +BINDIR = $(PREFIX)/bin |
---|
18 | +LIBDIR = $(PREFIX)/lib |
---|
19 | + |
---|
20 | ifneq ($(EXTRA_PREFIX),) |
---|
21 | EXTRA_INCLUDES += $(EXTRA_PREFIX)/include |
---|
22 | EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBDIR) |
---|
23 | diff -urNad xen-3.1.0-src~/config/ia64.mk xen-3.1.0-src/config/ia64.mk |
---|
24 | --- xen-3.1.0-src~/config/ia64.mk 2007-05-18 16:45:21.000000000 +0200 |
---|
25 | +++ xen-3.1.0-src/config/ia64.mk 2007-06-19 21:50:09.205477427 +0200 |
---|
26 | @@ -3,5 +3,3 @@ |
---|
27 | |
---|
28 | CONFIG_IOEMU := y |
---|
29 | CONFIG_XCUTILS := y |
---|
30 | - |
---|
31 | -LIBDIR := lib |
---|
32 | diff -urNad xen-3.1.0-src~/config/powerpc64.mk xen-3.1.0-src/config/powerpc64.mk |
---|
33 | --- xen-3.1.0-src~/config/powerpc64.mk 2007-05-18 16:45:21.000000000 +0200 |
---|
34 | +++ xen-3.1.0-src/config/powerpc64.mk 2007-06-19 21:50:09.205477427 +0200 |
---|
35 | @@ -4,4 +4,3 @@ |
---|
36 | CONFIG_XENCOMM := y |
---|
37 | |
---|
38 | CFLAGS += -DELFSIZE=64 |
---|
39 | -LIBDIR := lib |
---|
40 | diff -urNad xen-3.1.0-src~/config/x86_32.mk xen-3.1.0-src/config/x86_32.mk |
---|
41 | --- xen-3.1.0-src~/config/x86_32.mk 2007-05-18 16:45:21.000000000 +0200 |
---|
42 | +++ xen-3.1.0-src/config/x86_32.mk 2007-06-19 21:50:09.205477427 +0200 |
---|
43 | @@ -8,7 +8,6 @@ |
---|
44 | CONFIG_IOEMU := y |
---|
45 | |
---|
46 | CFLAGS += -m32 -march=i686 |
---|
47 | -LIBDIR := lib |
---|
48 | |
---|
49 | # Use only if calling $(LD) directly. |
---|
50 | ifeq ($(XEN_OS),OpenBSD) |
---|
51 | diff -urNad xen-3.1.0-src~/config/x86_64.mk xen-3.1.0-src/config/x86_64.mk |
---|
52 | --- xen-3.1.0-src~/config/x86_64.mk 2007-05-18 16:45:21.000000000 +0200 |
---|
53 | +++ xen-3.1.0-src/config/x86_64.mk 2007-06-19 21:50:09.209477785 +0200 |
---|
54 | @@ -9,7 +9,6 @@ |
---|
55 | CONFIG_IOEMU := y |
---|
56 | |
---|
57 | CFLAGS += -m64 |
---|
58 | -LIBDIR = $(LIB64DIR) |
---|
59 | |
---|
60 | # Use only if calling $(LD) directly. |
---|
61 | ifeq ($(XEN_OS),OpenBSD) |
---|
62 | diff -urNad xen-3.1.0-src~/tools/Rules.mk xen-3.1.0-src/tools/Rules.mk |
---|
63 | --- xen-3.1.0-src~/tools/Rules.mk 2007-05-18 16:45:21.000000000 +0200 |
---|
64 | +++ xen-3.1.0-src/tools/Rules.mk 2007-06-19 21:50:09.209477785 +0200 |
---|
65 | @@ -10,6 +10,9 @@ |
---|
66 | XEN_XENSTORE = $(XEN_ROOT)/tools/xenstore |
---|
67 | XEN_LIBXENSTAT = $(XEN_ROOT)/tools/xenstat/libxenstat/src |
---|
68 | |
---|
69 | +RPATH_ARG := -Wl,-rpath,/usr/$(LIBDIR) |
---|
70 | +LDFLAGS += $(RPATH_ARG) |
---|
71 | + |
---|
72 | X11_LDPATH = -L/usr/X11R6/$(LIBDIR) |
---|
73 | |
---|
74 | CFLAGS += -D__XEN_TOOLS__ |
---|
75 | diff -urNad xen-3.1.0-src~/tools/blktap/drivers/Makefile xen-3.1.0-src/tools/blktap/drivers/Makefile |
---|
76 | --- xen-3.1.0-src~/tools/blktap/drivers/Makefile 2007-05-18 16:45:21.000000000 +0200 |
---|
77 | +++ xen-3.1.0-src/tools/blktap/drivers/Makefile 2007-06-19 21:50:09.209477785 +0200 |
---|
78 | @@ -5,7 +5,7 @@ |
---|
79 | |
---|
80 | IBIN = blktapctrl tapdisk |
---|
81 | QCOW_UTIL = img2qcow qcow2raw qcow-create |
---|
82 | -INST_DIR = /usr/sbin |
---|
83 | +INST_DIR = /usr/$(BINDIR) |
---|
84 | LIBAIO_DIR = ../../libaio/src |
---|
85 | |
---|
86 | CFLAGS += -Werror |
---|
87 | @@ -42,11 +42,11 @@ |
---|
88 | |
---|
89 | |
---|
90 | blktapctrl: blktapctrl.c |
---|
91 | - $(CC) $(CFLAGS) -o blktapctrl $(LIBS) blktapctrl.c |
---|
92 | + $(CC) $(CFLAGS) -o blktapctrl $(LDFLAGS) $(LIBS) blktapctrl.c |
---|
93 | |
---|
94 | tapdisk: $(BLK-OBJS) tapdisk.c |
---|
95 | $(CC) $(CFLAGS) -o tapdisk $(BLK-OBJS) tapdisk.c \ |
---|
96 | - $(AIOLIBS) $(LIBS) |
---|
97 | + $(AIOLIBS) $(LDFLAGS) $(LIBS) |
---|
98 | |
---|
99 | .PHONY: qcow-util |
---|
100 | qcow-util: img2qcow qcow2raw qcow-create |
---|
101 | diff -urNad xen-3.1.0-src~/tools/console/Makefile xen-3.1.0-src/tools/console/Makefile |
---|
102 | --- xen-3.1.0-src~/tools/console/Makefile 2007-05-18 16:45:21.000000000 +0200 |
---|
103 | +++ xen-3.1.0-src/tools/console/Makefile 2007-06-19 21:50:09.209477785 +0200 |
---|
104 | @@ -2,8 +2,7 @@ |
---|
105 | XEN_ROOT=../.. |
---|
106 | include $(XEN_ROOT)/tools/Rules.mk |
---|
107 | |
---|
108 | -DAEMON_INSTALL_DIR = /usr/sbin |
---|
109 | -CLIENT_INSTALL_DIR = /usr/$(LIBDIR)/xen/bin |
---|
110 | +DIR = /usr/$(BINDIR) |
---|
111 | |
---|
112 | CFLAGS += -Werror |
---|
113 | |
---|
114 | @@ -21,16 +20,15 @@ |
---|
115 | $(RM) client/*.o daemon/*.o |
---|
116 | |
---|
117 | xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c)) |
---|
118 | - $(CC) $(CFLAGS) $^ -o $@ -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \ |
---|
119 | + $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \ |
---|
120 | $(SOCKET_LIBS) -lxenctrl -lxenstore |
---|
121 | |
---|
122 | xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c)) |
---|
123 | - $(CC) $(CFLAGS) $^ -o $@ -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \ |
---|
124 | + $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \ |
---|
125 | $(SOCKET_LIBS) -lxenctrl -lxenstore |
---|
126 | |
---|
127 | .PHONY: install |
---|
128 | install: $(BIN) |
---|
129 | - $(INSTALL_DIR) $(DESTDIR)/$(DAEMON_INSTALL_DIR) |
---|
130 | - $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(DAEMON_INSTALL_DIR) |
---|
131 | - $(INSTALL_DIR) $(DESTDIR)/$(CLIENT_INSTALL_DIR) |
---|
132 | - $(INSTALL_PROG) xenconsole $(DESTDIR)/$(CLIENT_INSTALL_DIR) |
---|
133 | + $(INSTALL_DIR) $(DESTDIR)/$(DIR) |
---|
134 | + $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(DIR) |
---|
135 | + $(INSTALL_PROG) xenconsole $(DESTDIR)/$(DIR) |
---|
136 | diff -urNad xen-3.1.0-src~/tools/misc/Makefile xen-3.1.0-src/tools/misc/Makefile |
---|
137 | --- xen-3.1.0-src~/tools/misc/Makefile 2007-05-18 16:45:21.000000000 +0200 |
---|
138 | +++ xen-3.1.0-src/tools/misc/Makefile 2007-06-19 21:50:09.209477785 +0200 |
---|
139 | @@ -14,7 +14,7 @@ |
---|
140 | TARGETS := $(TARGETS-y) |
---|
141 | |
---|
142 | INSTALL_BIN = $(TARGETS) xencons |
---|
143 | -INSTALL_SBIN = netfix xm xen-bugtool xen-python-path xend xenperf |
---|
144 | +INSTALL_BIN = netfix xm xen-bugtool xen-python-path xend xenperf |
---|
145 | |
---|
146 | .PHONY: all |
---|
147 | all: build |
---|
148 | @@ -26,10 +26,7 @@ |
---|
149 | |
---|
150 | .PHONY: install |
---|
151 | install: build |
---|
152 | - [ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin |
---|
153 | - [ -d $(DESTDIR)/usr/sbin ] || $(INSTALL_DIR) $(DESTDIR)/usr/sbin |
---|
154 | - $(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)/usr/bin |
---|
155 | - $(INSTALL_PROG) $(INSTALL_SBIN) $(DESTDIR)/usr/sbin |
---|
156 | + $(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)/usr/$(BINDIR) |
---|
157 | $(MAKE) -C lomount install |
---|
158 | # No sense in installing miniterm on the Xen box. |
---|
159 | # $(MAKE) -C miniterm install |
---|
160 | @@ -44,4 +41,4 @@ |
---|
161 | $(CC) -c $(CFLAGS) -o $@ $< |
---|
162 | |
---|
163 | xenperf: %: %.o Makefile |
---|
164 | - $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl |
---|
165 | + $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -L$(XEN_LIBXC) -lxenctrl |
---|
166 | diff -urNad xen-3.1.0-src~/tools/misc/lomount/Makefile xen-3.1.0-src/tools/misc/lomount/Makefile |
---|
167 | --- xen-3.1.0-src~/tools/misc/lomount/Makefile 2007-05-18 16:45:21.000000000 +0200 |
---|
168 | +++ xen-3.1.0-src/tools/misc/lomount/Makefile 2007-06-19 21:50:09.209477785 +0200 |
---|
169 | @@ -16,7 +16,7 @@ |
---|
170 | |
---|
171 | .PHONY: install |
---|
172 | install: build |
---|
173 | - $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin |
---|
174 | + $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/$(BINDIR) |
---|
175 | |
---|
176 | .PHONY: clean |
---|
177 | clean: |
---|
178 | diff -urNad xen-3.1.0-src~/tools/pygrub/Makefile xen-3.1.0-src/tools/pygrub/Makefile |
---|
179 | --- xen-3.1.0-src~/tools/pygrub/Makefile 2007-05-18 16:45:21.000000000 +0200 |
---|
180 | +++ xen-3.1.0-src/tools/pygrub/Makefile 2007-06-19 21:50:09.209477785 +0200 |
---|
181 | @@ -12,7 +12,7 @@ |
---|
182 | ifndef XEN_PYTHON_NATIVE_INSTALL |
---|
183 | install: LIBPATH=$(shell PYTHONPATH=../python/xen/util python -c "import auxbin; print auxbin.libpath()") |
---|
184 | install: all |
---|
185 | - CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)/usr" --prefix="" --install-lib="$(DESTDIR)$(LIBPATH)/python" |
---|
186 | + CC="$(CC)" CFLAGS="$(CFLAGS)" LIBDIR="$(LIBDIR)" python setup.py install --home="$(DESTDIR)/usr/$(LIBDIR)" --prefix="" --install-lib="$(DESTDIR)/usr/$(LIBDIR)/python" --install-scripts=$(DESTDIR)/usr/$(BINDIR) |
---|
187 | $(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot |
---|
188 | else |
---|
189 | install: all |
---|
190 | diff -urNad xen-3.1.0-src~/tools/python/Makefile xen-3.1.0-src/tools/python/Makefile |
---|
191 | --- xen-3.1.0-src~/tools/python/Makefile 2007-05-18 16:45:21.000000000 +0200 |
---|
192 | +++ xen-3.1.0-src/tools/python/Makefile 2007-06-19 21:50:09.209477785 +0200 |
---|
193 | @@ -16,7 +16,7 @@ |
---|
194 | |
---|
195 | .PHONY: build buildpy |
---|
196 | buildpy: |
---|
197 | - CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py build |
---|
198 | + CC="$(CC)" CFLAGS="$(CFLAGS)" LIBDIR="$(LIBDIR)" python setup.py build |
---|
199 | |
---|
200 | build: buildpy refresh-pot refresh-po $(CATALOGS) |
---|
201 | |
---|
202 | @@ -57,10 +57,10 @@ |
---|
203 | ifndef XEN_PYTHON_NATIVE_INSTALL |
---|
204 | install: LIBPATH=$(shell PYTHONPATH=xen/util python -c "import auxbin; print auxbin.libpath()") |
---|
205 | install: install-messages install-dtd |
---|
206 | - CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)/usr" --prefix="" --force --install-lib="$(DESTDIR)$(LIBPATH)/python" |
---|
207 | + CC="$(CC)" CFLAGS="$(CFLAGS)" LIBDIR="$(LIBDIR)" python setup.py install --home="$(DESTDIR)/usr/$(LIBDIR)" --install-lib=$(DESTDIR)/usr/$(LIBDIR)/python --force |
---|
208 | else |
---|
209 | install: install-messages install-dtd |
---|
210 | - CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)" --force |
---|
211 | + CC="$(CC)" CFLAGS="$(CFLAGS)" LIBDIR="$(LIBDIR)" python setup.py install --root="$(DESTDIR)" --force |
---|
212 | endif |
---|
213 | |
---|
214 | install-dtd: all |
---|
215 | diff -urNad xen-3.1.0-src~/tools/python/setup.py xen-3.1.0-src/tools/python/setup.py |
---|
216 | --- xen-3.1.0-src~/tools/python/setup.py 2007-05-18 16:45:21.000000000 +0200 |
---|
217 | +++ xen-3.1.0-src/tools/python/setup.py 2007-06-19 21:50:09.209477785 +0200 |
---|
218 | @@ -5,6 +5,7 @@ |
---|
219 | XEN_ROOT = "../.." |
---|
220 | |
---|
221 | extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ] |
---|
222 | +extra_link_args = [ "-Wl,-rpath,/usr/%s" % os.environ['LIBDIR'] ] |
---|
223 | |
---|
224 | include_dirs = [ XEN_ROOT + "/tools/libxc", |
---|
225 | XEN_ROOT + "/tools/xenstore", |
---|
226 | @@ -18,6 +19,7 @@ |
---|
227 | |
---|
228 | xc = Extension("xc", |
---|
229 | extra_compile_args = extra_compile_args, |
---|
230 | + extra_link_args = extra_link_args, |
---|
231 | include_dirs = include_dirs + [ "xen/lowlevel/xc" ], |
---|
232 | library_dirs = library_dirs, |
---|
233 | libraries = libraries, |
---|
234 | @@ -25,6 +27,7 @@ |
---|
235 | |
---|
236 | xs = Extension("xs", |
---|
237 | extra_compile_args = extra_compile_args, |
---|
238 | + extra_link_args = extra_link_args, |
---|
239 | include_dirs = include_dirs + [ "xen/lowlevel/xs" ], |
---|
240 | library_dirs = library_dirs, |
---|
241 | libraries = libraries, |
---|
242 | @@ -32,6 +35,7 @@ |
---|
243 | |
---|
244 | scf = Extension("scf", |
---|
245 | extra_compile_args = extra_compile_args, |
---|
246 | + extra_link_args = extra_link_args, |
---|
247 | include_dirs = include_dirs + [ "xen/lowlevel/scf" ], |
---|
248 | library_dirs = library_dirs, |
---|
249 | libraries = libraries, |
---|
250 | @@ -39,6 +43,7 @@ |
---|
251 | |
---|
252 | acm = Extension("acm", |
---|
253 | extra_compile_args = extra_compile_args, |
---|
254 | + extra_link_args = extra_link_args, |
---|
255 | include_dirs = include_dirs + [ "xen/lowlevel/acm" ], |
---|
256 | library_dirs = library_dirs, |
---|
257 | libraries = libraries, |
---|
258 | @@ -46,6 +51,7 @@ |
---|
259 | |
---|
260 | ptsname = Extension("ptsname", |
---|
261 | extra_compile_args = extra_compile_args, |
---|
262 | + extra_link_args = extra_link_args, |
---|
263 | include_dirs = include_dirs + [ "ptsname" ], |
---|
264 | library_dirs = library_dirs, |
---|
265 | libraries = libraries, |
---|
266 | diff -urNad xen-3.1.0-src~/tools/xcutils/Makefile xen-3.1.0-src/tools/xcutils/Makefile |
---|
267 | --- xen-3.1.0-src~/tools/xcutils/Makefile 2007-05-18 16:45:21.000000000 +0200 |
---|
268 | +++ xen-3.1.0-src/tools/xcutils/Makefile 2007-06-19 21:50:59.489985541 +0200 |
---|
269 | @@ -11,7 +11,7 @@ |
---|
270 | XEN_ROOT = ../.. |
---|
271 | include $(XEN_ROOT)/tools/Rules.mk |
---|
272 | |
---|
273 | -PROGRAMS_INSTALL_DIR = /usr/$(LIBDIR)/xen/bin |
---|
274 | +PROGRAMS_INSTALL_DIR = /usr/$(BINDIR) |
---|
275 | |
---|
276 | INCLUDES += -I $(XEN_LIBXC) -I $(XEN_XENSTORE) |
---|
277 | |
---|
278 | @@ -33,7 +33,7 @@ |
---|
279 | build: $(PROGRAMS) |
---|
280 | |
---|
281 | $(PROGRAMS): %: %.o |
---|
282 | - $(CC) $(CFLAGS) $^ $(LDLIBS) -o $@ |
---|
283 | + $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@ |
---|
284 | |
---|
285 | .PHONY: install |
---|
286 | install: build |
---|
287 | diff -urNad xen-3.1.0-src~/tools/xenmon/Makefile xen-3.1.0-src/tools/xenmon/Makefile |
---|
288 | --- xen-3.1.0-src~/tools/xenmon/Makefile 2007-05-18 16:45:21.000000000 +0200 |
---|
289 | +++ xen-3.1.0-src/tools/xenmon/Makefile 2007-06-19 21:50:09.209477785 +0200 |
---|
290 | @@ -13,8 +13,6 @@ |
---|
291 | XEN_ROOT=../.. |
---|
292 | include $(XEN_ROOT)/tools/Rules.mk |
---|
293 | |
---|
294 | -sbindir=/usr/sbin |
---|
295 | - |
---|
296 | CFLAGS += -Werror |
---|
297 | CFLAGS += -I $(XEN_XC) |
---|
298 | CFLAGS += -I $(XEN_LIBXC) |
---|
299 | @@ -31,10 +29,10 @@ |
---|
300 | |
---|
301 | .PHONY: install |
---|
302 | install: build |
---|
303 | - [ -d $(DESTDIR)$(sbindir) ] || $(INSTALL_DIR) $(DESTDIR)$(sbindir) |
---|
304 | - $(INSTALL_PROG) xenbaked $(DESTDIR)$(sbindir)/xenbaked |
---|
305 | - $(INSTALL_PROG) xentrace_setmask $(DESTDIR)$(sbindir)/xentrace_setmask |
---|
306 | - $(INSTALL_PROG) xenmon.py $(DESTDIR)$(sbindir)/xenmon.py |
---|
307 | + $(INSTALL_DIR) $(DESTDIR)/usr/$(BINDIR) |
---|
308 | + $(INSTALL_PROG) xenbaked $(DESTDIR)/usr/$(BINDIR)/xenbaked |
---|
309 | + $(INSTALL_PROG) xentrace_setmask $(DESTDIR)/usr/$(BINDIR)/xentrace_setmask |
---|
310 | + $(INSTALL_PROG) xenmon.py $(DESTDIR)/usr/$(BINDIR)/xenmon.py |
---|
311 | |
---|
312 | .PHONY: clean |
---|
313 | clean: |
---|
314 | diff -urNad xen-3.1.0-src~/tools/xenstat/xentop/Makefile xen-3.1.0-src/tools/xenstat/xentop/Makefile |
---|
315 | --- xen-3.1.0-src~/tools/xenstat/xentop/Makefile 2007-05-18 16:45:21.000000000 +0200 |
---|
316 | +++ xen-3.1.0-src/tools/xenstat/xentop/Makefile 2007-06-19 21:50:09.209477785 +0200 |
---|
317 | @@ -21,7 +21,6 @@ |
---|
318 | prefix=/usr |
---|
319 | mandir=$(prefix)/share/man |
---|
320 | man1dir=$(mandir)/man1 |
---|
321 | -sbindir=$(prefix)/sbin |
---|
322 | |
---|
323 | CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT) |
---|
324 | LDFLAGS += -L$(XEN_LIBXENSTAT) |
---|
325 | @@ -33,7 +32,7 @@ |
---|
326 | |
---|
327 | .PHONY: install |
---|
328 | install: xentop xentop.1 |
---|
329 | - $(INSTALL_PROG) xentop $(DESTDIR)$(sbindir)/xentop |
---|
330 | + $(INSTALL_PROG) xentop $(DESTDIR)/usr/$(BINDIR)/xentop |
---|
331 | $(INSTALL_DIR) $(DESTDIR)$(man1dir) |
---|
332 | $(INSTALL_DATA) xentop.1 $(DESTDIR)$(man1dir)/xentop.1 |
---|
333 | |
---|
334 | diff -urNad xen-3.1.0-src~/tools/xenstore/Makefile xen-3.1.0-src/tools/xenstore/Makefile |
---|
335 | --- xen-3.1.0-src~/tools/xenstore/Makefile 2007-05-18 16:45:21.000000000 +0200 |
---|
336 | +++ xen-3.1.0-src/tools/xenstore/Makefile 2007-06-19 21:50:09.209477785 +0200 |
---|
337 | @@ -170,13 +170,12 @@ |
---|
338 | install: all |
---|
339 | $(INSTALL_DIR) $(DESTDIR)/var/run/xenstored |
---|
340 | $(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored |
---|
341 | - $(INSTALL_DIR) $(DESTDIR)/usr/bin |
---|
342 | - $(INSTALL_DIR) $(DESTDIR)/usr/sbin |
---|
343 | + $(INSTALL_DIR) $(DESTDIR)/usr/$(BINDIR) |
---|
344 | $(INSTALL_DIR) $(DESTDIR)/usr/include |
---|
345 | - $(INSTALL_PROG) xenstored $(DESTDIR)/usr/sbin |
---|
346 | - $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/bin |
---|
347 | - $(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/bin |
---|
348 | - $(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/bin |
---|
349 | + $(INSTALL_PROG) xenstored $(DESTDIR)/usr/$(BINDIR) |
---|
350 | + $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/$(BINDIR) |
---|
351 | + $(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/$(BINDIR) |
---|
352 | + $(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/$(BINDIR) |
---|
353 | $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR) |
---|
354 | $(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR) |
---|
355 | ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenstore.so.$(MAJOR) |
---|
356 | diff -urNad xen-3.1.0-src~/tools/xentrace/Makefile xen-3.1.0-src/tools/xentrace/Makefile |
---|
357 | --- xen-3.1.0-src~/tools/xentrace/Makefile 2007-05-18 16:45:21.000000000 +0200 |
---|
358 | +++ xen-3.1.0-src/tools/xentrace/Makefile 2007-06-19 21:50:09.209477785 +0200 |
---|
359 | @@ -10,21 +10,20 @@ |
---|
360 | OBJS = $(patsubst %.c,%.o,$(wildcard *.c)) |
---|
361 | |
---|
362 | BIN = xentrace xentrace_setsize |
---|
363 | -LIBBIN = |
---|
364 | SCRIPTS = xentrace_format |
---|
365 | MAN1 = $(wildcard *.1) |
---|
366 | MAN8 = $(wildcard *.8) |
---|
367 | |
---|
368 | ifeq ($(XEN_TARGET_ARCH),x86_32) |
---|
369 | -LIBBIN += xenctx |
---|
370 | +BIN += xenctx |
---|
371 | endif |
---|
372 | |
---|
373 | ifeq ($(XEN_TARGET_ARCH),x86_64) |
---|
374 | -LIBBIN += xenctx |
---|
375 | +BIN += xenctx |
---|
376 | endif |
---|
377 | |
---|
378 | ifeq ($(XEN_TARGET_ARCH),ia64) |
---|
379 | -LIBBIN += xenctx |
---|
380 | +BIN += xenctx |
---|
381 | endif |
---|
382 | |
---|
383 | .PHONY: all |
---|
384 | @@ -35,21 +34,16 @@ |
---|
385 | |
---|
386 | .PHONY: install |
---|
387 | install: build |
---|
388 | - [ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin |
---|
389 | - [ -z "$(LIBBIN)" ] || [ -d $(DESTDIR)/usr/$(LIBDIR)/xen/bin ] || \ |
---|
390 | - $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)/xen/bin |
---|
391 | - [ -d $(DESTDIR)/usr/share/man/man1 ] || \ |
---|
392 | - $(INSTALL_DIR) $(DESTDIR)/usr/share/man/man1 |
---|
393 | - [ -d $(DESTDIR)/usr/share/man/man8 ] || \ |
---|
394 | - $(INSTALL_DIR) $(DESTDIR)/usr/share/man/man8 |
---|
395 | - $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin |
---|
396 | - [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)/usr/$(LIBDIR)/xen/bin |
---|
397 | + $(INSTALL_DIR) $(DESTDIR)/usr/$(BINDIR) |
---|
398 | + $(INSTALL_DIR) $(DESTDIR)/usr/share/man/man1 |
---|
399 | + $(INSTALL_DIR) $(DESTDIR)/usr/share/man/man8 |
---|
400 | + $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/$(BINDIR) |
---|
401 | $(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/share/man/man1 |
---|
402 | $(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/share/man/man8 |
---|
403 | |
---|
404 | .PHONY: clean |
---|
405 | clean: |
---|
406 | - $(RM) *.a *.so *.o *.rpm $(BIN) $(LIBBIN) |
---|
407 | + $(RM) *.a *.so *.o *.rpm $(BIN) |
---|
408 | |
---|
409 | %: %.c $(HDRS) Makefile |
---|
410 | $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl |
---|