Author: waldi Date: Sun Sep 3 20:33:21 2006 New Revision: 299 Modified: trunk/xen-3.0/debian/patches/prefix-utils.dpatch Log: debian/patches/prefix-utils.dpatch: Next fix. Modified: trunk/xen-3.0/debian/patches/prefix-utils.dpatch =============================================================================--- trunk/xen-3.0/debian/patches/prefix-utils.dpatch (original) +++ trunk/xen-3.0/debian/patches/prefix-utils.dpatch Sun Sep 3 20:33:21 2006 @@ -8,7 +8,7 @@ @DPATCH@ diff -urNad xen-3.0~/Config.mk xen-3.0/Config.mk --- xen-3.0~/Config.mk 2006-08-21 05:12:20.000000000 +0000 -+++ xen-3.0/Config.mk 2006-09-03 17:23:19.654002141 +0000 ++++ xen-3.0/Config.mk 2006-09-03 20:25:04.288473701 +0000 @@ -47,11 +47,9 @@ CFLAGS += -m64 endif @@ -26,7 +26,7 @@ EXTRA_INCLUDES += $(EXTRA_PREFIX)/include diff -urNad xen-3.0~/tools/Rules.mk xen-3.0/tools/Rules.mk --- xen-3.0~/tools/Rules.mk 2006-08-21 05:12:22.000000000 +0000 -+++ xen-3.0/tools/Rules.mk 2006-09-03 17:23:19.654002141 +0000 ++++ xen-3.0/tools/Rules.mk 2006-09-03 20:25:04.288473701 +0000 @@ -10,6 +10,9 @@ XEN_XENSTORE = $(XEN_ROOT)/tools/xenstore XEN_LIBXENSTAT = $(XEN_ROOT)/tools/xenstat/libxenstat/src @@ -39,7 +39,7 @@ CFLAGS += -D__XEN_INTERFACE_VERSION__=0x00030101 diff -urNad xen-3.0~/tools/console/Makefile xen-3.0/tools/console/Makefile --- xen-3.0~/tools/console/Makefile 2006-08-21 05:12:21.000000000 +0000 -+++ xen-3.0/tools/console/Makefile 2006-09-03 17:23:19.654002141 +0000 ++++ xen-3.0/tools/console/Makefile 2006-09-03 20:26:04.569325276 +0000 @@ -2,8 +2,7 @@ XEN_ROOT=../.. include $(XEN_ROOT)/tools/Rules.mk @@ -50,7 +50,7 @@ INSTALL = install INSTALL_PROG = $(INSTALL) -m0755 -@@ -25,11 +24,11 @@ +@@ -25,16 +24,15 @@ $(RM) client/*.o daemon/*.o xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c)) @@ -64,9 +64,17 @@ -lxenctrl -lxenstore .PHONY: install + install: $(BIN) +- $(INSTALL_DIR) -p $(DESTDIR)/$(DAEMON_INSTALL_DIR) +- $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(DAEMON_INSTALL_DIR) +- $(INSTALL_DIR) -p $(DESTDIR)/$(CLIENT_INSTALL_DIR) +- $(INSTALL_PROG) xenconsole $(DESTDIR)/$(CLIENT_INSTALL_DIR) ++ $(INSTALL_DIR) -p $(DESTDIR)/$(DIR) ++ $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(DIR) ++ $(INSTALL_PROG) xenconsole $(DESTDIR)/$(DIR) diff -urNad xen-3.0~/tools/misc/Makefile xen-3.0/tools/misc/Makefile --- xen-3.0~/tools/misc/Makefile 2006-08-21 05:12:27.000000000 +0000 -+++ xen-3.0/tools/misc/Makefile 2006-09-03 17:23:26.494927688 +0000 ++++ xen-3.0/tools/misc/Makefile 2006-09-03 20:25:04.288473701 +0000 @@ -16,7 +16,7 @@ TARGETS = xenperf xc_shadow @@ -97,7 +105,7 @@ + $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -L$(XEN_LIBXC) -lxenctrl diff -urNad xen-3.0~/tools/misc/cpuperf/Makefile xen-3.0/tools/misc/cpuperf/Makefile --- xen-3.0~/tools/misc/cpuperf/Makefile 2006-08-21 05:12:27.000000000 +0000 -+++ xen-3.0/tools/misc/cpuperf/Makefile 2006-09-03 17:23:19.654002141 +0000 ++++ xen-3.0/tools/misc/cpuperf/Makefile 2006-09-03 20:25:04.288473701 +0000 @@ -37,14 +37,14 @@ $(CC) $(CFLAGS) -o $@ $< @@ -117,7 +125,7 @@ # End of $RCSfile: Makefile,v $ diff -urNad xen-3.0~/tools/misc/lomount/Makefile xen-3.0/tools/misc/lomount/Makefile --- xen-3.0~/tools/misc/lomount/Makefile 2006-08-21 05:12:27.000000000 +0000 -+++ xen-3.0/tools/misc/lomount/Makefile 2006-09-03 17:23:19.654002141 +0000 ++++ xen-3.0/tools/misc/lomount/Makefile 2006-09-03 20:25:04.288473701 +0000 @@ -21,7 +21,7 @@ .PHONY: install @@ -129,7 +137,7 @@ clean: diff -urNad xen-3.0~/tools/pygrub/Makefile xen-3.0/tools/pygrub/Makefile --- xen-3.0~/tools/pygrub/Makefile 2006-08-21 05:12:24.000000000 +0000 -+++ xen-3.0/tools/pygrub/Makefile 2006-09-03 17:23:19.654002141 +0000 ++++ xen-3.0/tools/pygrub/Makefile 2006-09-03 20:25:04.288473701 +0000 @@ -11,7 +11,7 @@ .PHONY: install ifndef XEN_PYTHON_NATIVE_INSTALL @@ -141,7 +149,7 @@ CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)" diff -urNad xen-3.0~/tools/python/Makefile xen-3.0/tools/python/Makefile --- xen-3.0~/tools/python/Makefile 2006-08-21 05:12:25.000000000 +0000 -+++ xen-3.0/tools/python/Makefile 2006-09-03 17:23:19.654002141 +0000 ++++ xen-3.0/tools/python/Makefile 2006-09-03 20:25:04.288473701 +0000 @@ -6,15 +6,15 @@ .PHONY: build @@ -163,7 +171,7 @@ .PHONY: test diff -urNad xen-3.0~/tools/python/setup.py xen-3.0/tools/python/setup.py --- xen-3.0~/tools/python/setup.py 2006-08-21 05:12:25.000000000 +0000 -+++ xen-3.0/tools/python/setup.py 2006-09-03 17:23:19.654002141 +0000 ++++ xen-3.0/tools/python/setup.py 2006-09-03 20:25:04.288473701 +0000 @@ -5,6 +5,8 @@ XEN_ROOT = "../.." @@ -191,7 +199,7 @@ libraries = libraries, diff -urNad xen-3.0~/tools/xcutils/Makefile xen-3.0/tools/xcutils/Makefile --- xen-3.0~/tools/xcutils/Makefile 2006-08-21 05:12:28.000000000 +0000 -+++ xen-3.0/tools/xcutils/Makefile 2006-09-03 17:23:19.654002141 +0000 ++++ xen-3.0/tools/xcutils/Makefile 2006-09-03 20:25:04.288473701 +0000 @@ -15,7 +15,7 @@ XEN_ROOT = ../.. include $(XEN_ROOT)/tools/Rules.mk @@ -203,7 +211,7 @@ diff -urNad xen-3.0~/tools/xenmon/Makefile xen-3.0/tools/xenmon/Makefile --- xen-3.0~/tools/xenmon/Makefile 2006-08-21 05:12:26.000000000 +0000 -+++ xen-3.0/tools/xenmon/Makefile 2006-09-03 17:23:19.654002141 +0000 ++++ xen-3.0/tools/xenmon/Makefile 2006-09-03 20:25:04.288473701 +0000 @@ -15,8 +15,6 @@ INSTALL_DIR = $(INSTALL) -d -m0755 INSTALL_DATA = $(INSTALL) -m0644 @@ -230,7 +238,7 @@ clean: diff -urNad xen-3.0~/tools/xenstat/xentop/Makefile xen-3.0/tools/xenstat/xentop/Makefile --- xen-3.0~/tools/xenstat/xentop/Makefile 2006-08-21 05:12:28.000000000 +0000 -+++ xen-3.0/tools/xenstat/xentop/Makefile 2006-09-03 17:23:19.654002141 +0000 ++++ xen-3.0/tools/xenstat/xentop/Makefile 2006-09-03 20:25:04.288473701 +0000 @@ -25,7 +25,6 @@ prefix=/usr mandir=$(prefix)/share/man @@ -250,7 +258,7 @@ endif diff -urNad xen-3.0~/tools/xenstore/Makefile xen-3.0/tools/xenstore/Makefile --- xen-3.0~/tools/xenstore/Makefile 2006-08-21 05:12:23.000000000 +0000 -+++ xen-3.0/tools/xenstore/Makefile 2006-09-03 17:23:19.654002141 +0000 ++++ xen-3.0/tools/xenstore/Makefile 2006-09-03 20:25:04.288473701 +0000 @@ -157,14 +157,13 @@ install: all $(INSTALL_DIR) -p $(DESTDIR)/var/run/xenstored @@ -274,7 +282,7 @@ $(INSTALL_DATA) xs_lib.h $(DESTDIR)/usr/include diff -urNad xen-3.0~/tools/xentrace/Makefile xen-3.0/tools/xentrace/Makefile --- xen-3.0~/tools/xentrace/Makefile 2006-08-21 05:12:25.000000000 +0000 -+++ xen-3.0/tools/xentrace/Makefile 2006-09-03 17:23:19.654002141 +0000 ++++ xen-3.0/tools/xentrace/Makefile 2006-09-03 20:25:04.288473701 +0000 @@ -15,17 +15,16 @@ OBJS = $(patsubst %.c,%.o,$(wildcard *.c))