# HG changeset patch
# User kaf24@scramble.cl.cam.ac.uk
# Date 1106954399 0
# Node ID c3c66a2762cb990f1882b5e8634292ef5adf4f04
# Parent  5e111ac8c357fdd6122548d348a676fde19fa95e# Parent  0c8d62df84aed3170b785103c476709895155526
bitkeeper revision 1.1159.212.54 (41fac89fnck8lIgXT0fcIHlQ9aM_7Q)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk


diff -r 5e111ac8c357 -r c3c66a2762cb tools/libxc/Makefile
--- a/tools/libxc/Makefile	Fri Jan 28 22:30:30 2005 +0000
+++ b/tools/libxc/Makefile	Fri Jan 28 23:19:59 2005 +0000
@@ -69,7 +69,7 @@ mk-symlinks:
 install: all
 	[ -d $(DESTDIR)/usr/lib ] || $(INSTALL_DIR) $(DESTDIR)/usr/lib
 	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
-	$(INSTALL_PROG) $(LIB) $(DESTDIR)/usr/lib
+	$(INSTALL_PROG) libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib
 	ln -sf libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib/libxc.so.$(MAJOR)
 	ln -sf libxc.so.$(MAJOR) $(DESTDIR)/usr/lib/libxc.so
 	$(INSTALL_DATA) xc.h $(DESTDIR)/usr/include
diff -r 5e111ac8c357 -r c3c66a2762cb tools/libxutil/Makefile
--- a/tools/libxutil/Makefile	Fri Jan 28 22:30:30 2005 +0000
+++ b/tools/libxutil/Makefile	Fri Jan 28 23:19:59 2005 +0000
@@ -64,7 +64,7 @@ check-for-zlib:
 
 install: all
 	[ -d $(DESTDIR)/usr/lib ] || $(INSTALL_DIR) -p $(DESTDIR)/usr/lib
-	$(INSTALL_PROG) $(LIB) $(DESTDIR)/usr/lib
+	$(INSTALL_PROG) $(LIB_NAME).so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib
 	ln -sf $(LIB_NAME).so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib/$(LIB_NAME).so.$(MAJOR)
 	ln -sf $(LIB_NAME).so.$(MAJOR) $(DESTDIR)/usr/lib/$(LIB_NAME).so