ia64/xen-unstable

changeset 3523:2cf794f4d28c

bitkeeper revision 1.1159.212.36 (41f5b27eVQ8sFZbTAxrN9sb2Nbirbg)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xeno.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-unstable.bk
author iap10@freefall.cl.cam.ac.uk
date Tue Jan 25 02:44:14 2005 +0000 (2005-01-25)
parents 89da70a626a7 8f5003f54216
children e90c7778ab94
files tools/ioemu/iodev/Makefile tools/xcs/Makefile
line diff
     1.1 --- a/tools/ioemu/iodev/Makefile	Tue Jan 25 02:25:44 2005 +0000
     1.2 +++ b/tools/ioemu/iodev/Makefile	Tue Jan 25 02:44:14 2005 +0000
     1.3 @@ -12,4 +12,4 @@ device-model: $(OBJS) $(BXLIBS)
     1.4  include $(TOPDIR)/mk/helix.mk
     1.5  
     1.6  install:: all
     1.7 -	install device-model $(prefix)/usr/sbin
     1.8 +	install device-model $(DESTDIR)/usr/sbin
     2.1 --- a/tools/xcs/Makefile	Tue Jan 25 02:25:44 2005 +0000
     2.2 +++ b/tools/xcs/Makefile	Tue Jan 25 02:44:14 2005 +0000
     2.3 @@ -6,6 +6,10 @@ include $(XEN_ROOT)/tools/Make.defs
     2.4  
     2.5  XCS_INSTALL_DIR = /usr/sbin
     2.6  
     2.7 +INSTALL         = install
     2.8 +INSTALL_PROG    = $(INSTALL) -m0755
     2.9 +INSTALL_DIR     = $(INSTALL) -d -m0755
    2.10 +
    2.11  CC       = gcc
    2.12  CFLAGS   = -Wall -Werror -g3 -D _XOPEN_SOURCE=600
    2.13  
    2.14 @@ -37,8 +41,8 @@ xcsdump: xcsdump.c
    2.15  	$(CC) $(CFLAGS) $^ -o $@ -L$(XEN_LIBXC) -L$(XEN_LIBXUTIL) -lxc -lxutil 
    2.16  
    2.17  install: xcs xcsdump
    2.18 -	mkdir -p $(prefix)/$(XCS_INSTALL_DIR)
    2.19 -	mkdir -p $(prefix)/usr/include
    2.20 -	install -m0755 xcs $(prefix)/$(XCS_INSTALL_DIR)
    2.21 -	install -m0755 xcsdump $(prefix)/$(XCS_INSTALL_DIR)
    2.22 -	install -m0644 xcs_proto.h $(prefix)/usr/include
    2.23 +	$(INSTALL_DIR) -p $(DESTDIR)/$(XCS_INSTALL_DIR)
    2.24 +	$(INSTALL_DIR) -p $(DESTDIR)/usr/include
    2.25 +	$(INSTALL_PROG) xcs $(DESTDIR)/$(XCS_INSTALL_DIR)
    2.26 +	$(INSTALL_PROG) xcsdump $(DESTDIR)/$(XCS_INSTALL_DIR)
    2.27 +	$(INSTALL_PROG) xcs_proto.h $(DESTDIR)/usr/include