ia64/xen-unstable

changeset 3538:f7ab8a19799b

bitkeeper revision 1.1159.212.41 (41f6787aKvcI0-k3FYgkk8w74QD5gg)

manual merge.
author kaf24@scramble.cl.cam.ac.uk
date Tue Jan 25 16:48:58 2005 +0000 (2005-01-25)
parents 8b969ff555c1 5c6d547e4e59
children 93b8d938e316
files Makefile docs/Makefile linux-2.4.29-xen-sparse/arch/xen/Makefile linux-2.6.10-xen-sparse/arch/xen/Makefile tools/Makefile tools/examples/Makefile tools/libxc/Makefile tools/libxutil/Makefile tools/python/Makefile tools/vnet/Makefile tools/vnet/examples/Makefile tools/vnet/vnet-module/Makefile-2.4 tools/vnet/vnet-module/Makefile-2.6 tools/vnet/vnetd/Makefile tools/xfrd/Makefile xen/Makefile
line diff
     1.1 --- a/Makefile	Tue Jan 25 15:38:35 2005 +0000
     1.2 +++ b/Makefile	Tue Jan 25 16:48:58 2005 +0000
     1.3 @@ -2,9 +2,6 @@
     1.4  # Grand Unified Makefile for Xen.
     1.5  #
     1.6  
     1.7 -DISTDIR		?= $(CURDIR)/dist
     1.8 -DESTDIR		?= $(DISTDIR)/install
     1.9 -
    1.10  INSTALL		:= install
    1.11  INSTALL_DIR	:= $(INSTALL) -d -m0755
    1.12  INSTALL_DATA	:= $(INSTALL) -m0644
    1.13 @@ -18,7 +15,6 @@ ALLKERNELS = $(patsubst buildconfigs/mk.
    1.14  ALLSPARSETREES = $(patsubst %-xen-sparse,%,$(wildcard *-xen-sparse))
    1.15  XKERNELS := $(foreach kernel, $(KERNELS), $(patsubst buildconfigs/mk.%,%,$(wildcard buildconfigs/mk.$(kernel))) )
    1.16  
    1.17 -
    1.18  export DESTDIR
    1.19  
    1.20  include buildconfigs/Rules.mk
    1.21 @@ -31,26 +27,16 @@ all: dist
    1.22  
    1.23  # install everything into the standard system directories
    1.24  # NB: install explicitly does not check that everything is up to date!
    1.25 -install: install-tools install-xen install-kernels install-docs
    1.26 +install: xen checked-tools kernels docs
    1.27  
    1.28 -install-xen:
    1.29 -	$(MAKE) -C xen install
    1.30 -
    1.31 -install-tools:
    1.32 +# Only check for install req'mts on 'make install', not on 'make dist'.
    1.33 +checked-tools:
    1.34 +	$(MAKE) -C tools/check install
    1.35  	$(MAKE) -C tools install
    1.36  
    1.37 -install-kernels:
    1.38 -	cp -a $(DESTDIR)/boot/* /boot/
    1.39 -	cp -a $(DESTDIR)/lib/modules/* /lib/modules/
    1.40 -	cp -dR $(DESTDIR)/boot/*$(LINUX_VER)* $(prefix)/boot/
    1.41 -	cp -dR $(DESTDIR)/lib/modules/* $(prefix)/lib/modules/
    1.42 -
    1.43 -install-docs:
    1.44 -	sh ./docs/check_pkgs && $(MAKE) -C docs install || true
    1.45 -	sh ./docs/check_pkgs
    1.46 -	-$(MAKE) -C docs install
    1.47 -
    1.48  # build and install everything into local dist directory
    1.49 +dist: DISTDIR=$(CURDIR)/dist
    1.50 +dist: DESTDIR=$(DISTDIR)/install
    1.51  dist: xen tools kernels docs
    1.52  	$(INSTALL_DIR) $(DISTDIR)/check
    1.53  	$(INSTALL_DATA) ./COPYING $(DISTDIR)
    1.54 @@ -59,17 +45,16 @@ dist: xen tools kernels docs
    1.55  	$(INSTALL_PROG) tools/check/chk tools/check/check_* $(DISTDIR)/check
    1.56  
    1.57  xen:
    1.58 -	$(MAKE) dist=yes -C xen install
    1.59 +	$(MAKE) -C xen install
    1.60  
    1.61  tools:
    1.62 -	$(MAKE) dist=yes -C tools install
    1.63 +	$(MAKE) -C tools install
    1.64  
    1.65  kernels:
    1.66  	for i in $(XKERNELS) ; do $(MAKE) $$i-build || exit 1; done
    1.67  
    1.68  docs:
    1.69 -	sh ./docs/check_pkgs
    1.70 -	-$(MAKE) dist=yes -C docs install
    1.71 +	sh ./docs/check_pkgs && $(MAKE) -C docs install || true
    1.72  
    1.73  # Build all the various kernels and modules
    1.74  kbuild: kernels
    1.75 @@ -126,21 +111,17 @@ install-iptables:
    1.76  
    1.77  help:
    1.78  	@echo 'Installation targets:'
    1.79 -	@echo '  install          - install everything'
    1.80 -	@echo '  install-xen      - install the Xen hypervisor'
    1.81 -	@echo '  install-tools    - install the control tools'
    1.82 -	@echo '  install-kernels  - install guest kernels'
    1.83 -	@echo '  install-docs     - install documentation'
    1.84 +	@echo '  install          - build and install everything'
    1.85  	@echo ''
    1.86  	@echo 'Building targets:'
    1.87 -	@echo '  dist             - build everything and place in dist/'
    1.88 +	@echo '  dist             - build and install everything into local dist directory'
    1.89  	@echo '  world            - clean everything, delete guest kernel build'
    1.90  	@echo '                     trees then make dist'
    1.91 -	@echo '  xen              - build Xen hypervisor and place in dist/'
    1.92 -	@echo '  tools            - build tools and place in dist/'
    1.93 -	@echo '  kernels          - build guest kernels and place in dist/'
    1.94 +	@echo '  xen              - build and install Xen hypervisor'
    1.95 +	@echo '  tools            - build and install tools'
    1.96 +	@echo '  kernels          - build and install guest kernels'
    1.97  	@echo '  kbuild           - synonym for make kernels'
    1.98 -	@echo '  docs             - build docs and place in dist/'
    1.99 +	@echo '  docs             - build and install docs'
   1.100  	@echo ''
   1.101  	@echo 'Cleaning targets:'
   1.102  	@echo '  clean            - clean the Xen, tools and docs (but not'
     2.1 --- a/docs/Makefile	Tue Jan 25 15:38:35 2005 +0000
     2.2 +++ b/docs/Makefile	Tue Jan 25 16:48:58 2005 +0000
     2.3 @@ -10,10 +10,7 @@ FIG2DEV		:= fig2dev
     2.4  TGIF		:= tgif
     2.5  LATEX2HTML	:= latex2html
     2.6  
     2.7 -package		= xen
     2.8 -prefix		= /usr
     2.9 -docdir		= $(prefix)/share/doc
    2.10 -pkgdocdir	= $(docdir)/$(package)
    2.11 +pkgdocdir	:= /usr/share/doc/xen
    2.12  
    2.13  DOC_TEX		:= $(wildcard src/*.tex)
    2.14  DOC_PS		:= $(patsubst src/%.tex,ps/%.ps,$(DOC_TEX))
     3.1 --- a/linux-2.4.29-xen-sparse/arch/xen/Makefile	Tue Jan 25 15:38:35 2005 +0000
     3.2 +++ b/linux-2.4.29-xen-sparse/arch/xen/Makefile	Tue Jan 25 16:48:58 2005 +0000
     3.3 @@ -120,9 +120,6 @@ install: bzImage
     3.4  	install -m0664 .config $(INSTALL_PATH)/boot/config-$(INSTALL_NAME)$(INSTALL_SUFFIX)
     3.5  	install -m0664 System.map $(INSTALL_PATH)/boot/System.map-$(INSTALL_NAME)$(INSTALL_SUFFIX)
     3.6  
     3.7 -dist: 
     3.8 -	$(MAKE) INSTALL_PATH=../dist/install install
     3.9 -
    3.10  %_config: arch/xen/defconfig-%
    3.11  	rm -f .config arch/xen/defconfig
    3.12  	cp -f arch/xen/defconfig-$(@:_config=) arch/xen/defconfig
     4.1 --- a/linux-2.6.10-xen-sparse/arch/xen/Makefile	Tue Jan 25 15:38:35 2005 +0000
     4.2 +++ b/linux-2.6.10-xen-sparse/arch/xen/Makefile	Tue Jan 25 16:48:58 2005 +0000
     4.3 @@ -54,8 +54,6 @@ install: vmlinuz
     4.4  	install -m0664 System.map $(INSTALL_PATH)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
     4.5  	mkdir -p $(INSTALL_PATH)/usr/include/xen/linux
     4.6  	install -m0644 include/asm-xen/linux-public/*.h $(INSTALL_PATH)/usr/include/xen/linux
     4.7 -dist:
     4.8 -	$(MAKE) INSTALL_PATH=../dist/install install
     4.9  
    4.10  archclean:
    4.11  	@if [ -e arch/xen/arch ]; then $(MAKE) $(clean)=arch/xen/arch; fi;
     5.1 --- a/tools/Makefile	Tue Jan 25 15:38:35 2005 +0000
     5.2 +++ b/tools/Makefile	Tue Jan 25 16:48:58 2005 +0000
     5.3 @@ -12,9 +12,7 @@ all:
     5.4  	$(MAKE) -C ioemu
     5.5  
     5.6  install: 
     5.7 -ifneq ($(dist),yes)
     5.8 -	$(MAKE) -C check install
     5.9 -endif
    5.10 +	$(MAKE) -C check
    5.11  	$(MAKE) -C libxutil install
    5.12  	$(MAKE) -C libxc install
    5.13  	$(MAKE) -C misc install
    5.14 @@ -26,9 +24,6 @@ endif
    5.15  	$(MAKE) -C xcs install
    5.16  	$(MAKE) -C ioemu install
    5.17  
    5.18 -dist: $(TARGET)
    5.19 -	$(MAKE) prefix=$(CURDIR)/../dist/install dist=yes install
    5.20 -
    5.21  clean:
    5.22  	$(MAKE) -C libxutil clean
    5.23  	$(MAKE) -C libxc clean
     6.1 --- a/tools/examples/Makefile	Tue Jan 25 15:38:35 2005 +0000
     6.2 +++ b/tools/examples/Makefile	Tue Jan 25 16:48:58 2005 +0000
     6.3 @@ -36,14 +36,14 @@ install-configs:
     6.4  	$(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR)
     6.5  	$(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR)/auto
     6.6  	for i in $(XEN_CONFIGS); \
     6.7 -	    do [ -a $(DESTDIR)/$(XEN_CONFIG_DIR)/$$i ] || \
     6.8 +	    do [ -a $(DESTDIR)$(XEN_CONFIG_DIR)/$$i ] || \
     6.9  	    $(INSTALL_DATA) $$i $(DESTDIR)$(XEN_CONFIG_DIR); \
    6.10  	done
    6.11  
    6.12  install-scripts:
    6.13  	$(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR)
    6.14  	for i in $(XEN_SCRIPTS); \
    6.15 -	    do [ -a $(DESTDIR)/$()/$$i ] || \
    6.16 +	    do [ -a $(DESTDIR)$(XEN_SCRIPT_DIR)/$$i ] || \
    6.17  	    $(INSTALL_PROG) $$i $(DESTDIR)$(XEN_SCRIPT_DIR); \
    6.18  	done
    6.19  
     7.1 --- a/tools/libxc/Makefile	Tue Jan 25 15:38:35 2005 +0000
     7.2 +++ b/tools/libxc/Makefile	Tue Jan 25 16:48:58 2005 +0000
     7.3 @@ -3,10 +3,9 @@ INSTALL_PROG	= $(INSTALL) -m0755
     7.4  INSTALL_DATA	= $(INSTALL) -m0644
     7.5  INSTALL_DIR	= $(INSTALL) -d -m0755
     7.6  
     7.7 -MAJOR		:= 2.0
     7.8 -MINOR		:= 0
     7.9 -LIB_NAME	:= libxc
    7.10 -SONAME		:= $(LIB_NAME).so.$(MAJOR)
    7.11 +MAJOR    = 2.0
    7.12 +MINOR    = 0
    7.13 +SONAME   = libxc.so.$(MAJOR)
    7.14  
    7.15  CC       = gcc
    7.16  
    7.17 @@ -41,10 +40,9 @@ CFLAGS   += $(INCLUDES) -I.
    7.18  CFLAGS   += -Wp,-MD,.$(@F).d
    7.19  DEPS     = .*.d
    7.20  
    7.21 -OBJS     := $(patsubst %.c,%.o,$(SRCS))
    7.22 -PIC_OBJS := $(patsubst %.c,%.opic,$(SRCS))
    7.23 +OBJS     = $(patsubst %.c,%.o,$(SRCS))
    7.24  
    7.25 -LIB		:= $(LIB_NAME).a $(LIB_NAME).so $(LIB_NAME).so.$(MAJOR) $(LIB_NAME).so.$(MAJOR).$(MINOR)
    7.26 +LIB      = libxc.so libxc.so.$(MAJOR) libxc.so.$(MAJOR).$(MINOR)
    7.27  
    7.28  all: check-for-zlib mk-symlinks
    7.29  	$(MAKE) $(LIB)
    7.30 @@ -77,7 +75,7 @@ install: all
    7.31  	$(INSTALL_DATA) xc.h $(DESTDIR)/usr/include
    7.32  
    7.33  clean:
    7.34 -	rm -rf *.a *.so *.o *.opic *.rpm $(LIB) *~ $(DEPS) xen TAGS
    7.35 +	rm -rf *.a *.so *.o *.rpm $(LIB) *~ $(DEPS) xen
    7.36  
    7.37  rpm: all
    7.38  	rm -rf staging
    7.39 @@ -88,21 +86,11 @@ rpm: all
    7.40  	mv staging/i386/*.rpm .
    7.41  	rm -rf staging
    7.42  
    7.43 -$(PIC_OBJS): %.opic: %.c
    7.44 -	$(CC) $(CPPFLAGS) -DPIC $(CFLAGS) -fPIC -c -o $@ $<
    7.45 -
    7.46 -$(LIB_NAME).a: $(OBJS)
    7.47 -	$(AR) rc $@ $^
    7.48 -
    7.49 -$(LIB_NAME).so: $(LIB_NAME).so.$(MAJOR)
    7.50 -	ln -sf $< $@
    7.51 -$(LIB_NAME).so.$(MAJOR): $(LIB_NAME).so.$(MAJOR).$(MINOR)
    7.52 -	ln -sf $< $@
    7.53 -$(LIB_NAME).so.$(MAJOR).$(MINOR): $(PIC_OBJS)
    7.54 +libxc.so:
    7.55 +	ln -sf libxc.so.$(MAJOR) $@
    7.56 +libxc.so.$(MAJOR):
    7.57 +	ln -sf libxc.so.$(MAJOR).$(MINOR) $@
    7.58 +libxc.so.$(MAJOR).$(MINOR): $(OBJS)
    7.59  	$(CC) -Wl,-soname -Wl,$(SONAME) -shared -o $@ $^ -L../libxutil -lxutil -lz
    7.60  
    7.61 -.PHONY: TAGS clean install mk-symlinks rpm
    7.62 -TAGS:
    7.63 -	etags -t $(SRCS) *.h
    7.64 -
    7.65  -include $(DEPS)
     8.1 --- a/tools/libxutil/Makefile	Tue Jan 25 15:38:35 2005 +0000
     8.2 +++ b/tools/libxutil/Makefile	Tue Jan 25 16:48:58 2005 +0000
     8.3 @@ -24,13 +24,8 @@ LIB_SRCS += sys_string.c
     8.4  LIB_SRCS += util.c
     8.5  
     8.6  LIB_OBJS := $(LIB_SRCS:.c=.o)
     8.7 -LIB_PIC_OBJS := $(LIB_SRCS:.c=.opic)
     8.8  
     8.9 -CFLAGS   += -Wall
    8.10 -CFLAGS   += -Werror
    8.11 -CFLAGS   += -g
    8.12 -CFLAGS   += -O3
    8.13 -CFLAGS   += -fno-strict-aliasing
    8.14 +CFLAGS   += -Wall -Werror -O3 -fno-strict-aliasing
    8.15  
    8.16  # Get gcc to generate the dependencies for us.
    8.17  CFLAGS   += -Wp,-MD,.$(@F).d
    8.18 @@ -39,7 +34,6 @@ DEPS     = .*.d
    8.19  MAJOR    := 2.0
    8.20  MINOR    := 0
    8.21  LIB_NAME := libxutil
    8.22 -SO_NAME  := $(LIB_NAME).so.$(MAJOR)
    8.23  LIB      := $(LIB_NAME).so 
    8.24  LIB      += $(LIB_NAME).so.$(MAJOR)
    8.25  LIB      += $(LIB_NAME).so.$(MAJOR).$(MINOR)
    8.26 @@ -48,17 +42,14 @@ LIB      += $(LIB_NAME).a
    8.27  all: check-for-zlib
    8.28  	$(MAKE) $(LIB)
    8.29  
    8.30 -$(LIB_PIC_OBJS): %.opic: %.c
    8.31 -	$(CC) $(CPPFLAGS) -DPIC $(CFLAGS) -fPIC -c -o $@ $<
    8.32 -
    8.33  $(LIB_NAME).so: $(LIB_NAME).so.$(MAJOR)
    8.34  	ln -sf $^ $@
    8.35  
    8.36  $(LIB_NAME).so.$(MAJOR): $(LIB_NAME).so.$(MAJOR).$(MINOR)
    8.37  	ln -sf $^ $@
    8.38  
    8.39 -$(LIB_NAME).so.$(MAJOR).$(MINOR): $(LIB_PIC_OBJS)
    8.40 -	$(CC) -Wl,-soname -Wl,$(SO_NAME) -shared -o $@ $^
    8.41 +$(LIB_NAME).so.$(MAJOR).$(MINOR): $(LIB_OBJS)
    8.42 +	$(CC) -Wl,-soname -Wl,$(LIB_NAME).so.$(MAJOR) -shared -o $@ $^
    8.43  
    8.44  $(LIB_NAME).a: $(LIB_OBJS)
    8.45  	$(AR) rc $@ $^
    8.46 @@ -78,7 +69,7 @@ install: all
    8.47  	ln -sf $(LIB_NAME).so.$(MAJOR) $(DESTDIR)/usr/lib/$(LIB_NAME).so
    8.48  
    8.49  clean:
    8.50 -	$(RM) *.a *.so *.so.* *.o *.opic *.rpm 
    8.51 +	$(RM) *.a *.so *.so.* *.o *.rpm 
    8.52  	$(RM) *~
    8.53  	$(RM) $(DEPS)
    8.54  
     9.1 --- a/tools/python/Makefile	Tue Jan 25 15:38:35 2005 +0000
     9.2 +++ b/tools/python/Makefile	Tue Jan 25 16:48:58 2005 +0000
     9.3 @@ -3,11 +3,7 @@ all:
     9.4  	python setup.py build
     9.5  
     9.6  install: all
     9.7 -	if [ "$(DESTDIR)" = "" ]; then                   \
     9.8 -	    python setup.py install;                     \
     9.9 -	else                                             \
    9.10 -	    python setup.py install --root="$(DESTDIR)"; \
    9.11 -	fi
    9.12 +	python setup.py install --home="$(DESTDIR)/usr"
    9.13  
    9.14  clean:
    9.15  	rm -rf build *.pyc *.pyo *.o *.a *~
    10.1 --- a/tools/vnet/Makefile	Tue Jan 25 15:38:35 2005 +0000
    10.2 +++ b/tools/vnet/Makefile	Tue Jan 25 16:48:58 2005 +0000
    10.3 @@ -44,9 +44,6 @@ install: compile
    10.4  	$(MAKE) -C vnet-module install
    10.5  	$(MAKE) -C examples install
    10.6  
    10.7 -dist: $(TARGET)
    10.8 -	$(MAKE) install
    10.9 -
   10.10  clean:
   10.11  	-$(MAKE) -C vnetd clean
   10.12  	-$(MAKE) -C vnet-module clean
    11.1 --- a/tools/vnet/examples/Makefile	Tue Jan 25 15:38:35 2005 +0000
    11.2 +++ b/tools/vnet/examples/Makefile	Tue Jan 25 16:48:58 2005 +0000
    11.3 @@ -6,7 +6,7 @@ XEN_SCRIPT_DIR:=/etc/xen/scripts
    11.4  all:
    11.5  
    11.6  install:
    11.7 -	install -m 0755 -d $(prefix)$(XEN_SCRIPT_DIR)
    11.8 -	install -m 0554 network-vnet $(prefix)$(XEN_SCRIPT_DIR)
    11.9 +	install -m 0755 -d $(DESTDIR)$(XEN_SCRIPT_DIR)
   11.10 +	install -m 0554 network-vnet $(DESTDIR)$(XEN_SCRIPT_DIR)
   11.11  
   11.12  clean:
   11.13 \ No newline at end of file
    12.1 --- a/tools/vnet/vnet-module/Makefile-2.4	Tue Jan 25 15:38:35 2005 +0000
    12.2 +++ b/tools/vnet/vnet-module/Makefile-2.4	Tue Jan 25 16:48:58 2005 +0000
    12.3 @@ -83,8 +83,8 @@ module modules: $(KERNEL_MODULE)
    12.4  
    12.5  .PHONY: install install-module modules_install
    12.6  install install-module modules_install: module
    12.7 -	install -m 0755 -d $(prefix)$(KERNEL_MODULE_DIR)
    12.8 -	install -m 0554 $(KERNEL_MODULE) $(prefix)$(KERNEL_MODULE_DIR)
    12.9 +	install -m 0755 -d $(DESTDIR)$(KERNEL_MODULE_DIR)
   12.10 +	install -m 0554 $(KERNEL_MODULE) $(DESTDIR)$(KERNEL_MODULE_DIR)
   12.11  
   12.12  TAGS:
   12.13  	etags *.c *.h
    13.1 --- a/tools/vnet/vnet-module/Makefile-2.6	Tue Jan 25 15:38:35 2005 +0000
    13.2 +++ b/tools/vnet/vnet-module/Makefile-2.6	Tue Jan 25 16:48:58 2005 +0000
    13.3 @@ -38,8 +38,8 @@ module modules:
    13.4  
    13.5  .PHONY: install install-module modules_install
    13.6  install install-module modules_install: module
    13.7 -	install -m 0755 -d $(prefix)$(KERNEL_MODULE_DIR)
    13.8 -	install -m 0554 $(KERNEL_MODULE) $(prefix)$(KERNEL_MODULE_DIR)
    13.9 +	install -m 0755 -d $(DESTDIR)$(KERNEL_MODULE_DIR)
   13.10 +	install -m 0554 $(KERNEL_MODULE) $(DESTDIR)$(KERNEL_MODULE_DIR)
   13.11  
   13.12  .PHONY: clean
   13.13  clean:
    14.1 --- a/tools/vnet/vnetd/Makefile	Tue Jan 25 15:38:35 2005 +0000
    14.2 +++ b/tools/vnet/vnetd/Makefile	Tue Jan 25 16:48:58 2005 +0000
    14.3 @@ -92,8 +92,8 @@ vnetd: $(VNETD_OBJ)
    14.4  	$(CC) $(CFLAGS) -o $@ $^ $(VNETD_LIBS) -ldl -lpthread
    14.5  
    14.6  install: vnetd
    14.7 -	mkdir -p $(prefix)/$(VNETD_INSTALL_DIR)
    14.8 -	install -m 0755 vnetd $(prefix)/$(VNETD_INSTALL_DIR)
    14.9 +	mkdir -p $(DESTDIR)$(VNETD_INSTALL_DIR)
   14.10 +	install -m 0755 vnetd $(DESTDIR)$(VNETD_INSTALL_DIR)
   14.11  
   14.12  clean:
   14.13  	-rm -f *.a *.o *~
    15.1 --- a/tools/xfrd/Makefile	Tue Jan 25 15:38:35 2005 +0000
    15.2 +++ b/tools/xfrd/Makefile	Tue Jan 25 16:48:58 2005 +0000
    15.3 @@ -72,8 +72,8 @@ xfrd: $(XFRD_PROG_OBJ)
    15.4  
    15.5  .PHONY: install
    15.6  install: xfrd
    15.7 -	$(INSTALL_DIR) $(DESTDIR)/$(XFRD_INSTALL_DIR)
    15.8 -	$(INSTALL_PROG) xfrd $(DESTDIR)/$(XFRD_INSTALL_DIR)
    15.9 +	$(INSTALL_DIR) $(DESTDIR)$(XFRD_INSTALL_DIR)
   15.10 +	$(INSTALL_PROG) xfrd $(DESTDIR)$(XFRD_INSTALL_DIR)
   15.11  
   15.12  .PHONY: libutil
   15.13  libutil: $(UTIL_LIB)
    16.1 --- a/xen/Makefile	Tue Jan 25 15:38:35 2005 +0000
    16.2 +++ b/xen/Makefile	Tue Jan 25 16:48:58 2005 +0000
    16.3 @@ -9,7 +9,6 @@ export XEN_SUBVERSION    = 0
    16.4  export XEN_EXTRAVERSION  = "-devel"
    16.5  
    16.6  export BASEDIR          := $(CURDIR)
    16.7 -DESTDIR			:= $(CURDIR)/../dist/install
    16.8  
    16.9  include Rules.mk
   16.10  
   16.11 @@ -30,8 +29,6 @@ install: $(TARGET).gz
   16.12  	$(INSTALL_DATA) include/public/io/*.h $(DESTDIR)/usr/include/xen/io
   16.13  	$(INSTALL_DATA) include/public/COPYING $(DESTDIR)/usr/include/xen
   16.14  
   16.15 -dist: install
   16.16 -
   16.17  clean:
   16.18  	$(MAKE) -C tools clean
   16.19  	$(MAKE) -C common clean