ia64/xen-unstable

changeset 16841:6ed9b42d1ec4

Apply PREFIX directly to LIBDIR.

Signed-off-by: Bastian Blank <waldi@debian.org>
author Keir Fraser <keir.fraser@citrix.com>
date Tue Jan 22 14:29:11 2008 +0000 (2008-01-22)
parents d57a94546911
children 89995ccec15a
files Makefile config/StdGNU.mk config/SunOS.mk config/ia64.mk config/powerpc64.mk config/x86_32.mk config/x86_64.mk tools/blktap/lib/Makefile tools/console/Makefile tools/debugger/xenitp/Makefile tools/flask/libflask/Makefile tools/libfsimage/Rules.mk tools/libfsimage/common/Makefile tools/libxc/Makefile tools/libxen/Makefile tools/libxen/Makefile.dist tools/vnet/libxutil/Makefile tools/xcutils/Makefile tools/xenstore/Makefile tools/xentrace/Makefile
line diff
     1.1 --- a/Makefile	Tue Jan 22 14:27:22 2008 +0000
     1.2 +++ b/Makefile	Tue Jan 22 14:29:11 2008 +0000
     1.3 @@ -188,10 +188,10 @@ uninstall:
     1.4  	rm -rf $(D)/usr/include/xenctrl.h $(D)/usr/include/xenguest.h
     1.5  	rm -rf $(D)/usr/include/xs_lib.h $(D)/usr/include/xs.h
     1.6  	rm -rf $(D)/usr/include/xen
     1.7 -	rm -rf $(D)/usr/$(LIBDIR)/libxenctrl* $(D)/usr/$(LIBDIR)/libxenguest*
     1.8 -	rm -rf $(D)/usr/$(LIBDIR)/libxenstore*
     1.9 -	rm -rf $(D)/usr/$(LIBDIR)/python/xen $(D)/usr/$(LIBDIR)/python/grub
    1.10 -	rm -rf $(D)/usr/$(LIBDIR)/xen/
    1.11 +	rm -rf $(D)$(LIBDIR)/libxenctrl* $(D)$(LIBDIR)/libxenguest*
    1.12 +	rm -rf $(D)$(LIBDIR)/libxenstore*
    1.13 +	rm -rf $(D)$(LIBDIR)/python/xen $(D)$(LIBDIR)/python/grub
    1.14 +	rm -rf $(D)$(LIBDIR)/xen/
    1.15  	rm -rf $(D)/usr/lib/xen/
    1.16  	rm -rf $(D)/usr/local/sbin/setmask $(D)/usr/local/sbin/xen*
    1.17  	rm -rf $(D)/usr/sbin/xen* $(D)/usr/sbin/netfix $(D)/usr/sbin/xm
     2.1 --- a/config/StdGNU.mk	Tue Jan 22 14:27:22 2008 +0000
     2.2 +++ b/config/StdGNU.mk	Tue Jan 22 14:29:11 2008 +0000
     2.3 @@ -18,8 +18,8 @@ INSTALL_DATA = $(INSTALL) -m0644 -p
     2.4  INSTALL_PROG = $(INSTALL) -m0755 -p
     2.5  
     2.6  PREFIX ?= /usr
     2.7 -
     2.8 -LIB64DIR = lib64
     2.9 +LIBDIR = $(PREFIX)/lib
    2.10 +LIBDIR_x86_64 = $(PREFIX)/lib64
    2.11  
    2.12  SOCKET_LIBS =
    2.13  CURSES_LIBS = -lncurses
     3.1 --- a/config/SunOS.mk	Tue Jan 22 14:27:22 2008 +0000
     3.2 +++ b/config/SunOS.mk	Tue Jan 22 14:29:11 2008 +0000
     3.3 @@ -19,14 +19,17 @@ INSTALL_DATA = $(INSTALL) -m0644 -p
     3.4  INSTALL_PROG = $(INSTALL) -m0755 -p
     3.5  
     3.6  PREFIX ?= /usr
     3.7 +LIBDIR = $(PREFIX)/lib
     3.8 +LIBDIR_x86_64 = $(PREFIX)/lib/amd64
     3.9  
    3.10 -LIB64DIR = lib/amd64
    3.11 +SunOS_LIBDIR = /usr/sfw/lib
    3.12 +SunOS_LIBDIR_x86_64 = /usr/sfw/lib/amd64
    3.13  
    3.14  SOCKET_LIBS = -lsocket
    3.15  CURSES_LIBS = -lcurses
    3.16  UTIL_LIBS =
    3.17  SONAME_LDFLAG = -h
    3.18 -SHLIB_CFLAGS = -R /usr/sfw/$(LIBDIR) -shared
    3.19 +SHLIB_CFLAGS = -R $(SunOS_LIBDIR) -shared
    3.20  
    3.21  ifneq ($(debug),y)
    3.22  # Optimisation flags are overridable
     4.1 --- a/config/ia64.mk	Tue Jan 22 14:27:22 2008 +0000
     4.2 +++ b/config/ia64.mk	Tue Jan 22 14:29:11 2008 +0000
     4.3 @@ -4,5 +4,3 @@ CONFIG_IA64_$(XEN_OS) := y
     4.4  CONFIG_IOEMU := y
     4.5  CONFIG_XCUTILS := y
     4.6  CONFIG_XENCOMM := y
     4.7 -
     4.8 -LIBDIR := lib
     5.1 --- a/config/powerpc64.mk	Tue Jan 22 14:27:22 2008 +0000
     5.2 +++ b/config/powerpc64.mk	Tue Jan 22 14:29:11 2008 +0000
     5.3 @@ -4,4 +4,3 @@ CONFIG_POWERPC_$(XEN_OS) := y
     5.4  CONFIG_XENCOMM := y
     5.5  
     5.6  CFLAGS += -DELFSIZE=64
     5.7 -LIBDIR := lib
     6.1 --- a/config/x86_32.mk	Tue Jan 22 14:27:22 2008 +0000
     6.2 +++ b/config/x86_32.mk	Tue Jan 22 14:29:11 2008 +0000
     6.3 @@ -8,7 +8,6 @@ CONFIG_XCUTILS := y
     6.4  CONFIG_IOEMU := y
     6.5  
     6.6  CFLAGS += -m32 -march=i686
     6.7 -LIBDIR := lib
     6.8  
     6.9  # Use only if calling $(LD) directly.
    6.10  LDFLAGS_DIRECT_OpenBSD = _obsd
     7.1 --- a/config/x86_64.mk	Tue Jan 22 14:27:22 2008 +0000
     7.2 +++ b/config/x86_64.mk	Tue Jan 22 14:29:11 2008 +0000
     7.3 @@ -9,7 +9,10 @@ CONFIG_XCUTILS := y
     7.4  CONFIG_IOEMU := y
     7.5  
     7.6  CFLAGS += -m64
     7.7 -LIBDIR = $(LIB64DIR)
     7.8 +
     7.9 +LIBDIR = $(LIBDIR_x86_64)
    7.10 +
    7.11 +SunOS_LIBDIR = $(SunOS_LIBDIR_x86_64)
    7.12  
    7.13  # Use only if calling $(LD) directly.
    7.14  ifeq ($(XEN_OS),OpenBSD)
     8.1 --- a/tools/blktap/lib/Makefile	Tue Jan 22 14:27:22 2008 +0000
     8.2 +++ b/tools/blktap/lib/Makefile	Tue Jan 22 14:29:11 2008 +0000
     8.3 @@ -40,11 +40,11 @@ build: libblktap.a
     8.4  libblktap: libblktap.a
     8.5  
     8.6  install: all
     8.7 -	$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
     8.8 +	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
     8.9  	$(INSTALL_DIR) $(DESTDIR)/usr/include
    8.10 -	$(INSTALL_DATA) $(LIB) $(DESTDIR)/usr/$(LIBDIR)
    8.11 -	ln -sf libblktap.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libblktap.so.$(MAJOR)
    8.12 -	ln -sf libblktap.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libblktap.so
    8.13 +	$(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)
    8.14 +	ln -sf libblktap.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libblktap.so.$(MAJOR)
    8.15 +	ln -sf libblktap.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libblktap.so
    8.16  	$(INSTALL_DATA) blktaplib.h $(DESTDIR)/usr/include
    8.17  
    8.18  clean:
     9.1 --- a/tools/console/Makefile	Tue Jan 22 14:27:22 2008 +0000
     9.2 +++ b/tools/console/Makefile	Tue Jan 22 14:29:11 2008 +0000
     9.3 @@ -3,7 +3,7 @@ XEN_ROOT=../..
     9.4  include $(XEN_ROOT)/tools/Rules.mk
     9.5  
     9.6  DAEMON_INSTALL_DIR = /usr/sbin
     9.7 -CLIENT_INSTALL_DIR = /usr/$(LIBDIR)/xen/bin
     9.8 +CLIENT_INSTALL_DIR = $(LIBDIR)/xen/bin
     9.9  
    9.10  CFLAGS  += -Werror
    9.11  
    10.1 --- a/tools/debugger/xenitp/Makefile	Tue Jan 22 14:27:22 2008 +0000
    10.2 +++ b/tools/debugger/xenitp/Makefile	Tue Jan 22 14:29:11 2008 +0000
    10.3 @@ -27,14 +27,13 @@ build: $(BIN) $(LIBBIN)
    10.4  .PHONY: install
    10.5  install: build
    10.6  	[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
    10.7 -	[ -z "$(LIBBIN)" ] || [ -d $(DESTDIR)/usr/$(LIBDIR)/xen/bin ] || \
    10.8 -		$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)/xen/bin
    10.9 +	[ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/xen/bin
   10.10  	[ -d $(DESTDIR)/usr/share/man/man1 ] || \
   10.11  		$(INSTALL_DIR) $(DESTDIR)/usr/share/man/man1
   10.12  	[ -d $(DESTDIR)/usr/share/man/man8 ] || \
   10.13  		$(INSTALL_DIR) $(DESTDIR)/usr/share/man/man8
   10.14  	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin
   10.15 -	[ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)/usr/$(LIBDIR)/xen/bin
   10.16 +	[ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBDIR)/xen/bin
   10.17  	$(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/share/man/man1
   10.18  	$(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/share/man/man8
   10.19  
    11.1 --- a/tools/flask/libflask/Makefile	Tue Jan 22 14:27:22 2008 +0000
    11.2 +++ b/tools/flask/libflask/Makefile	Tue Jan 22 14:29:11 2008 +0000
    11.3 @@ -33,12 +33,12 @@ build:
    11.4  
    11.5  .PHONY: install
    11.6  install: build
    11.7 -	[ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
    11.8 +	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
    11.9  	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
   11.10 -	$(INSTALL_PROG) libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
   11.11 -	$(INSTALL_DATA) libflask.a $(DESTDIR)/usr/$(LIBDIR)
   11.12 -	ln -sf libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libflask.so.$(MAJOR)
   11.13 -	ln -sf libflask.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libflask.so
   11.14 +	$(INSTALL_PROG) libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
   11.15 +	$(INSTALL_DATA) libflask.a $(DESTDIR)$(LIBDIR)
   11.16 +	ln -sf libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libflask.so.$(MAJOR)
   11.17 +	ln -sf libflask.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libflask.so
   11.18  	$(INSTALL_DATA) include/flask.h $(DESTDIR)/usr/include
   11.19  
   11.20  .PHONY: TAGS
    12.1 --- a/tools/libfsimage/Rules.mk	Tue Jan 22 14:27:22 2008 +0000
    12.2 +++ b/tools/libfsimage/Rules.mk	Tue Jan 22 14:29:11 2008 +0000
    12.3 @@ -20,8 +20,8 @@ fs-all: $(FSLIB)
    12.4  
    12.5  .PHONY: fs-install
    12.6  fs-install: fs-all
    12.7 -	$(INSTALL_DIR) $(DESTDIR)/usr/$(FSDIR)
    12.8 -	$(INSTALL_PROG) $(FSLIB) $(DESTDIR)/usr/$(FSDIR)
    12.9 +	$(INSTALL_DIR) $(DESTDIR)$(FSDIR)
   12.10 +	$(INSTALL_PROG) $(FSLIB) $(DESTDIR)$(FSDIR)
   12.11  
   12.12  $(FSLIB): $(PIC_OBJS)
   12.13  	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $^ -lfsimage $(FS_LIBDEPS)
    13.1 --- a/tools/libfsimage/common/Makefile	Tue Jan 22 14:27:22 2008 +0000
    13.2 +++ b/tools/libfsimage/common/Makefile	Tue Jan 22 14:29:11 2008 +0000
    13.3 @@ -22,11 +22,11 @@ all: $(LIB)
    13.4  
    13.5  .PHONY: install
    13.6  install: all
    13.7 -	[ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
    13.8 +	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
    13.9  	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
   13.10 -	$(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
   13.11 -	ln -sf libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libfsimage.so.$(MAJOR)
   13.12 -	ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libfsimage.so
   13.13 +	$(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
   13.14 +	ln -sf libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libfsimage.so.$(MAJOR)
   13.15 +	ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libfsimage.so
   13.16  	$(INSTALL_DATA) fsimage.h $(DESTDIR)/usr/include
   13.17  	$(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)/usr/include
   13.18  	$(INSTALL_DATA) fsimage_grub.h $(DESTDIR)/usr/include
    14.1 --- a/tools/libxc/Makefile	Tue Jan 22 14:27:22 2008 +0000
    14.2 +++ b/tools/libxc/Makefile	Tue Jan 22 14:29:11 2008 +0000
    14.3 @@ -103,18 +103,18 @@ check-for-zlib:
    14.4  
    14.5  .PHONY: install
    14.6  install: build
    14.7 -	[ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
    14.8 +	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
    14.9  	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
   14.10 -	$(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
   14.11 -	$(INSTALL_DATA) libxenctrl.a $(DESTDIR)/usr/$(LIBDIR)
   14.12 -	ln -sf libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenctrl.so.$(MAJOR)
   14.13 -	ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenctrl.so
   14.14 +	$(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
   14.15 +	$(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(LIBDIR)
   14.16 +	ln -sf libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so.$(MAJOR)
   14.17 +	ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so
   14.18  	$(INSTALL_DATA) xenctrl.h $(DESTDIR)/usr/include
   14.19  
   14.20 -	$(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
   14.21 -	$(INSTALL_DATA) libxenguest.a $(DESTDIR)/usr/$(LIBDIR)
   14.22 -	ln -sf libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenguest.so.$(MAJOR)
   14.23 -	ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenguest.so
   14.24 +	$(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
   14.25 +	$(INSTALL_DATA) libxenguest.a $(DESTDIR)$(LIBDIR)
   14.26 +	ln -sf libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenguest.so.$(MAJOR)
   14.27 +	ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenguest.so
   14.28  	$(INSTALL_DATA) xenguest.h $(DESTDIR)/usr/include
   14.29  
   14.30  .PHONY: TAGS
    15.1 --- a/tools/libxen/Makefile	Tue Jan 22 14:27:22 2008 +0000
    15.2 +++ b/tools/libxen/Makefile	Tue Jan 22 14:29:11 2008 +0000
    15.3 @@ -56,11 +56,11 @@ libxenapi.a: $(LIBXENAPI_OBJS)
    15.4  .PHONY: install
    15.5  install: all
    15.6  	$(INSTALL_DIR) $(DESTDIR)/usr/include/xen/api
    15.7 -	$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
    15.8 -	$(INSTALL_PROG) libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
    15.9 -	ln -sf libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenapi.so.$(MAJOR)
   15.10 -	ln -sf libxenapi.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenapi.so
   15.11 -	$(INSTALL_DATA) libxenapi.a $(DESTDIR)/usr/$(LIBDIR)
   15.12 +	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
   15.13 +	$(INSTALL_PROG) libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
   15.14 +	ln -sf libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenapi.so.$(MAJOR)
   15.15 +	ln -sf libxenapi.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenapi.so
   15.16 +	$(INSTALL_DATA) libxenapi.a $(DESTDIR)$(LIBDIR)
   15.17  	set -e; for i in $(LIBXENAPI_HDRS); do \
   15.18  	    $(INSTALL_DATA) $$i $(DESTDIR)/usr/include/xen/api; \
   15.19  	done
    16.1 --- a/tools/libxen/Makefile.dist	Tue Jan 22 14:27:22 2008 +0000
    16.2 +++ b/tools/libxen/Makefile.dist	Tue Jan 22 14:29:11 2008 +0000
    16.3 @@ -66,11 +66,11 @@ libxenapi.a: $(LIBXENAPI_OBJS)
    16.4  .PHONY: install
    16.5  install: all
    16.6  	$(INSTALL_DIR) $(DESTDIR)/usr/include/xen/api
    16.7 -	$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
    16.8 -	$(INSTALL_PROG) libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
    16.9 -	ln -sf libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenapi.so.$(MAJOR)
   16.10 -	ln -sf libxenapi.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenapi.so
   16.11 -	$(INSTALL_DATA) libxenapi.a $(DESTDIR)/usr/$(LIBDIR)
   16.12 +	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
   16.13 +	$(INSTALL_PROG) libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
   16.14 +	ln -sf libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenapi.so.$(MAJOR)
   16.15 +	ln -sf libxenapi.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenapi.so
   16.16 +	$(INSTALL_DATA) libxenapi.a $(DESTDIR)$(LIBDIR)
   16.17  	set -e; for i in $(LIBXENAPI_HDRS); do \
   16.18  	    $(INSTALL_DATA) $$i $(DESTDIR)/usr/include/xen/api; \
   16.19  	done
    17.1 --- a/tools/vnet/libxutil/Makefile	Tue Jan 22 14:27:22 2008 +0000
    17.2 +++ b/tools/vnet/libxutil/Makefile	Tue Jan 22 14:29:11 2008 +0000
    17.3 @@ -71,11 +71,11 @@ check-for-zlib:
    17.4  
    17.5  .PHONY: install
    17.6  install: build
    17.7 -	[ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
    17.8 -	$(INSTALL_PROG) libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
    17.9 -	$(INSTALL_DATA) libxutil.a $(DESTDIR)/usr/$(LIBDIR)
   17.10 -	ln -sf libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxutil.so.$(MAJOR)
   17.11 -	ln -sf libxutil.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxutil.so
   17.12 +	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
   17.13 +	$(INSTALL_PROG) libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
   17.14 +	$(INSTALL_DATA) libxutil.a $(DESTDIR)$(LIBDIR)
   17.15 +	ln -sf libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxutil.so.$(MAJOR)
   17.16 +	ln -sf libxutil.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxutil.so
   17.17  
   17.18  .PHONY: clean
   17.19  clean:
    18.1 --- a/tools/xcutils/Makefile	Tue Jan 22 14:27:22 2008 +0000
    18.2 +++ b/tools/xcutils/Makefile	Tue Jan 22 14:29:11 2008 +0000
    18.3 @@ -11,7 +11,7 @@
    18.4  XEN_ROOT	= ../..
    18.5  include $(XEN_ROOT)/tools/Rules.mk
    18.6  
    18.7 -PROGRAMS_INSTALL_DIR = /usr/$(LIBDIR)/xen/bin
    18.8 +PROGRAMS_INSTALL_DIR = $(LIBDIR)/xen/bin
    18.9  
   18.10  INCLUDES += -I $(XEN_LIBXC) -I $(XEN_XENSTORE)
   18.11  
    19.1 --- a/tools/xenstore/Makefile	Tue Jan 22 14:27:22 2008 +0000
    19.2 +++ b/tools/xenstore/Makefile	Tue Jan 22 14:29:11 2008 +0000
    19.3 @@ -88,11 +88,11 @@ install: all
    19.4  	$(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/bin
    19.5  	$(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/bin
    19.6  	$(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/bin
    19.7 -	$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
    19.8 -	$(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
    19.9 -	ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenstore.so.$(MAJOR)
   19.10 -	ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenstore.so
   19.11 -	$(INSTALL_DATA) libxenstore.a $(DESTDIR)/usr/$(LIBDIR)
   19.12 +	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
   19.13 +	$(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
   19.14 +	ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenstore.so.$(MAJOR)
   19.15 +	ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenstore.so
   19.16 +	$(INSTALL_DATA) libxenstore.a $(DESTDIR)$(LIBDIR)
   19.17  	$(INSTALL_DATA) xs.h $(DESTDIR)/usr/include
   19.18  	$(INSTALL_DATA) xs_lib.h $(DESTDIR)/usr/include
   19.19  
    20.1 --- a/tools/xentrace/Makefile	Tue Jan 22 14:27:22 2008 +0000
    20.2 +++ b/tools/xentrace/Makefile	Tue Jan 22 14:29:11 2008 +0000
    20.3 @@ -36,14 +36,13 @@ build: $(BIN) $(LIBBIN)
    20.4  .PHONY: install
    20.5  install: build
    20.6  	[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
    20.7 -	[ -z "$(LIBBIN)" ] || [ -d $(DESTDIR)/usr/$(LIBDIR)/xen/bin ] || \
    20.8 -		$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)/xen/bin
    20.9 +	[ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/xen/bin
   20.10  	[ -d $(DESTDIR)/usr/share/man/man1 ] || \
   20.11  		$(INSTALL_DIR) $(DESTDIR)/usr/share/man/man1
   20.12  	[ -d $(DESTDIR)/usr/share/man/man8 ] || \
   20.13  		$(INSTALL_DIR) $(DESTDIR)/usr/share/man/man8
   20.14  	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin
   20.15 -	[ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)/usr/$(LIBDIR)/xen/bin
   20.16 +	[ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBDIR)/xen/bin
   20.17  	$(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/share/man/man1
   20.18  	$(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/share/man/man8
   20.19