[Xen-changelog] Automerge

[BitKeeper B. <ri...@su...>]

ChangeSet 1.1324, 2005/03/13 00:16:16+00:00, cl...@fi...

	Automerge



 Makefile |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)


diff -Nru a/tools/libxc/Makefile b/tools/libxc/Makefile
--- a/tools/libxc/Makefile	2005-03-12 20:02:21 -05:00
+++ b/tools/libxc/Makefile	2005-03-12 20:02:21 -05:00
@@ -47,7 +47,8 @@
 
 LIB      := libxc.a libxc.so libxc.so.$(MAJOR) libxc.so.$(MAJOR).$(MINOR)
 
-all: check-for-zlib mk-symlinks
+all: build
+build: check-for-zlib mk-symlinks
 	$(MAKE) $(LIB)
 
 check-for-zlib:
@@ -69,7 +70,7 @@
 	( cd xen/linux >/dev/null ; \
 	  ln -sf ../../$(LINUX_ROOT)/include/asm-xen/linux-public/*.h . )
 
-install: all
+install: build
 	[ -d $(DESTDIR)/usr/lib ] || $(INSTALL_DIR) $(DESTDIR)/usr/lib
 	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
 	$(INSTALL_PROG) libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib
@@ -86,7 +87,7 @@
 clean:
 	rm -rf *.a *.so* *.o *.opic *.rpm $(LIB) *~ $(DEPS) xen
 
-rpm: all
+rpm: build
 	rm -rf staging
 	mkdir staging
 	mkdir staging/i386