[Xen-changelog] merge

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Ian.Campbell@xxxxxxxxxxxxx
# Node ID 1c70b9d8173196c83ebf5d1567ce3b7f4ad9d749
# Parent  0ffd94a0231812372c0072af7caeeb3b8ff8ac0e
# Parent  5ab7cf758e2f97120d2c0a170587ed9a0b7d23cb
merge

diff -r 0ffd94a02318 -r 1c70b9d81731 tools/xenmon/Makefile
--- a/tools/xenmon/Makefile     Wed Jan 11 15:53:59 2006
+++ b/tools/xenmon/Makefile     Wed Jan 11 16:26:04 2006
@@ -13,12 +13,9 @@
 INSTALL         = install
 INSTALL_PROG    = $(INSTALL) -m0755
 INSTALL_DIR     = $(INSTALL) -d -m0755
-INSTALL_DATA    = $(INSTALL) -m064
+INSTALL_DATA    = $(INSTALL) -m0644
 
-prefix=/usr/local
-mandir=$(prefix)/share/man
-man1dir=$(mandir)/man1
-sbindir=$(prefix)/sbin
+sbindir=/usr/sbin
 
 XEN_ROOT=../..
 include $(XEN_ROOT)/tools/Rules.mk

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog