bitkeeper revision 1.761 (40446b53iVC1lWMdd8aC4YbIBLbvLg)

Makefile:
  Installation fixes from Adam Heath.

7 files changed, 38 insertions, 29 deletions

diff --git a/tools/balloon/Makefile b/tools/balloon/Makefile
index 9c08018cef..baf91f2fc7 100644
--- a/tools/balloon/Makefile
+++ b/tools/balloon/Makefile
@@ -5,8 +5,8 @@ $(TARGET): balloon.c
 	$(CC) -O2 -Wall -o $(TARGET) balloon.c
 
 install: $(TARGET)
-	mkdir -p /usr/bin
-	cp -a $(TARGET) /usr/bin
+	mkdir -p $(prefix)/usr/bin
+	cp -a $(TARGET) $(prefix)/usr/bin
 
 dist: $(TARGET)
 	mkdir -p ../../../install/bin
diff --git a/tools/examples/Makefile b/tools/examples/Makefile
index 626b08c915..0af1c854df 100644
--- a/tools/examples/Makefile
+++ b/tools/examples/Makefile
@@ -14,13 +14,13 @@ INITD    = xendomains
 all: 
 
 install: all
-	mkdir -p /usr/bin
-	cp -a $(INSTALL) /usr/bin
+	mkdir -p $(prefix)/usr/bin
+	cp -a $(INSTALL) $(prefix)/usr/bin
 	#chmod 755 $(INSTALL)
-	mkdir -p /etc/xc
-	for i in $(ETC) ; do [ ! -e /etc/xc/$$i ] && echo Install $$i && cp $$i /etc/xc/ ; done || true
-	mkdir -p /etc/xc/auto
-	for i in $(INITD) ; do [ -e /etc/init.d/ ] && [ ! -e /etc/init.d/$$i ] && cp $$i /etc/init.d/ ; done || true
+	mkdir -p $(prefix)/etc/xc
+	for i in $(ETC) ; do [ ! -e $(prefix)/etc/xc/$$i ] && echo Install $$i && cp $$i $(prefix)/etc/xc/ ; done || true
+	mkdir -p $(prefix)/etc/xc/auto
+	for i in $(INITD) ; do [ -e $(prefix)/etc/init.d/ ] && [ ! -e $(prefix)/etc/init.d/$$i ] && cp $$i $(prefix)/etc/init.d/ ; done || true
 
 dist: all
 	mkdir -p ../../../install/bin
diff --git a/tools/misc/Makefile b/tools/misc/Makefile
index 67a1ed9e47..38edf8e3aa 100644
--- a/tools/misc/Makefile
+++ b/tools/misc/Makefile
@@ -15,11 +15,11 @@ all: $(TARGETS)
 	$(MAKE) -C miniterm	
 
 install: all
-	mkdir -p /usr/bin
-	cp -a $(INSTALL) /usr/bin
-	chmod 755 /usr/bin/xen-mkdevnodes
-	chmod 755 /usr/bin/xen_nat_enable
-	chmod 755 /usr/bin/xen-clone
+	mkdir -p $(prefix)/usr/bin
+	cp -a $(INSTALL) $(prefix)/usr/bin
+	chmod 755 $(prefix)/usr/bin/xen-mkdevnodes
+	chmod 755 $(prefix)/usr/bin/xen_nat_enable
+	chmod 755 $(prefix)/usr/bin/xen-clone
 	$(MAKE) -C miniterm install
 
 dist: all
diff --git a/tools/misc/miniterm/Makefile b/tools/misc/miniterm/Makefile
index 4a3656fd25..993c156d5e 100644
--- a/tools/misc/miniterm/Makefile
+++ b/tools/misc/miniterm/Makefile
@@ -4,7 +4,7 @@ CFLAGS  = -O3 -march=i686 -Wall
 all: miniterm
 
 install: all
-	cp -a miniterm /usr/bin/	
+	cp -a miniterm $(prefix)/usr/bin/	
 
 dist: all
 	cp -a miniterm ../../../../install/bin/	
diff --git a/tools/xc/lib/Makefile b/tools/xc/lib/Makefile
index 188478cd25..021d855dee 100644
--- a/tools/xc/lib/Makefile
+++ b/tools/xc/lib/Makefile
@@ -1,4 +1,8 @@
 
+MAJOR    = 1.3
+MINOR    = 0
+SONAME   = libxc.so.$(MAJOR)
+
 CC       = gcc
 CFLAGS   = -c -Wall -O3 
 CFLAGS  += -I../../../xen/include -I../../../xenolinux-sparse/include
@@ -6,7 +10,7 @@ CFLAGS  += -I../../../xen/include -I../../../xenolinux-sparse/include
 HDRS     = $(wildcard *.h)
 OBJS     = $(patsubst %.c,%.o,$(wildcard *.c))
 
-LIB      = libxc.so
+LIB      = libxc.so libxc.so.$(MAJOR) libxc.so.$(MAJOR).$(MINOR)
 
 all: check-for-zlib $(LIB)
 
@@ -19,17 +23,17 @@ check-for-zlib:
 	fi
 
 install: all
-	mkdir -p /usr/lib
-	mkdir -p /usr/include
-	cp $(LIB) /usr/lib
-	chmod 755 /usr/lib/$(LIB)
-	cp xc.h /usr/include
-	chmod 644 /usr/include/xc.h
+	mkdir -p $(prefix)/usr/lib
+	mkdir -p $(prefix)/usr/include
+	cp -a $(LIB) $(prefix)/usr/lib
+	chmod 755 $(prefix)/usr/lib/$(LIB)
+	cp xc.h $(prefix)/usr/include
+	chmod 644 $(prefix)/usr/include/xc.h
 
 dist: all
 	mkdir -p ../../../../install/lib
 	mkdir -p ../../../../install/include
-	cp $(LIB) ../../../../install/lib
+	cp -a $(LIB) ../../../../install/lib
 	chmod 755 ../../../../install/lib/$(LIB)
 	cp xc.h ../../../../install/include
 	chmod 644 ../../../../install/include/xc.h
@@ -46,8 +50,12 @@ rpm: all
 	mv staging/i386/*.rpm .
 	rm -rf staging
 
-libxc.so: $(OBJS)
-	$(LD) -shared -o $@ $^ -lz
+libxc.so:
+	ln -sf libxc.so.$(MAJOR) $@
+libxc.so.$(MAJOR):
+	ln -sf libxc.so.$(MAJOR).$(MINOR) $@
+libxc.so.$(MAJOR).$(MINOR): $(OBJS)
+	$(CC) -Wl,-soname -Wl,$(SONAME) -shared -o $@ $^ -lz
 
 %.o: %.c $(HDRS) Makefile
 	$(CC) $(CFLAGS) -o $@ $<
diff --git a/tools/xc/py/Makefile b/tools/xc/py/Makefile
index ef7dc42173..058450e0dc 100644
--- a/tools/xc/py/Makefile
+++ b/tools/xc/py/Makefile
@@ -1,9 +1,10 @@
 
-all: ../lib/libxc.so ../lib/xc.h
+all: ../lib/libxc.so.1.3.0 ../lib/xc.h
 	python setup.py build
 
 install: all
-	python setup.py install
+	if [ "$(prefix)" = "" ]; then python setup.py install; \
+	else python setup.py install --root "$(prefix)"; fi
 
 dist: all
 	mkdir -p ../../../../install/lib/python
diff --git a/tools/xend/Makefile b/tools/xend/Makefile
index ab31f8c628..d070881519 100644
--- a/tools/xend/Makefile
+++ b/tools/xend/Makefile
@@ -11,9 +11,9 @@ BIN      = xend
 all: $(BIN)
 
 install: all
-	mkdir -p /usr/sbin
-	cp $(BIN) /usr/sbin
-	chmod 755 /usr/sbin/$(BIN)
+	mkdir -p $(prefix)/usr/sbin
+	cp $(BIN) $(prefix)/usr/sbin
+	chmod 755 $(prefix)/usr/sbin/$(BIN)
 
 dist: all
 	mkdir -p ../../../install/sbin