ia64/xen-unstable

changeset 3499:78b5439ce414

bitkeeper revision 1.1159.223.26 (41f2cdb6LNpheOtPoAKEUn-czlZFig)

Description: use DESTDIR correctly
Standard makefiles always attempt to install to the root(/). Setting
DESTDIR is the normal way to install to an alternative location.
Setting prefix has the possibility of breaking programs, as the prefix
may have been embedded inside a compiled binary.

From: Adam Heath <doogie@brainfood.com>
Signed-off-by: ian.pratt@cl.cam.ac.uk
author iap10@labyrinth.cl.cam.ac.uk
date Sat Jan 22 22:03:34 2005 +0000 (2005-01-22)
parents 1d24a5b0b338
children ef59de03bebf
files Makefile buildconfigs/mk.linux-2.4-xen0 buildconfigs/mk.linux-2.4-xenU buildconfigs/mk.linux-2.6-xen0 buildconfigs/mk.linux-2.6-xenU docs/Makefile tools/examples/Makefile tools/libxc/Makefile tools/libxutil/Makefile tools/misc/Makefile tools/misc/miniterm/Makefile tools/python/Makefile tools/sv/Makefile tools/xentrace/Makefile tools/xfrd/Makefile xen/Makefile
line diff
     1.1 --- a/Makefile	Sat Jan 22 21:54:34 2005 +0000
     1.2 +++ b/Makefile	Sat Jan 22 22:03:34 2005 +0000
     1.3 @@ -2,8 +2,9 @@
     1.4  # Grand Unified Makefile for Xen.
     1.5  #
     1.6  
     1.7 -DIST_DIR    ?= $(shell pwd)/dist
     1.8 -INSTALL_DIR ?= $(DIST_DIR)/install
     1.9 +DIST_DIR	:= $(CURDIR)/dist
    1.10 +DESTDIR		:= $(DIST_DIR)/install
    1.11 +
    1.12  INSTALL		:= install
    1.13  INSTALL_DIR	:= $(INSTALL) -d -m0755
    1.14  INSTALL_DATA	:= $(INSTALL) -m0644
    1.15 @@ -18,7 +19,7 @@ ALLSPARSETREES = $(patsubst %-xen-sparse
    1.16  XKERNELS := $(foreach kernel, $(KERNELS), $(patsubst buildconfigs/mk.%,%,$(wildcard buildconfigs/mk.$(kernel))) )
    1.17  
    1.18  
    1.19 -export INSTALL_DIR
    1.20 +export DESTDIR
    1.21  
    1.22  include buildconfigs/Rules.mk
    1.23  
    1.24 @@ -56,10 +57,10 @@ dist: xen.dist tools.dist kernels docs.i
    1.25  	$(INSTALL_PROG) tools/check/chk tools/check/check_* $(DIST_DIR)/check
    1.26  
    1.27  xen:
    1.28 -	$(MAKE) prefix=$(INSTALL_DIR) dist=yes -C xen install
    1.29 +	$(MAKE) dist=yes -C xen install
    1.30  
    1.31  tools:
    1.32 -	$(MAKE) prefix=$(INSTALL_DIR) dist=yes -C tools install
    1.33 +	$(MAKE) dist=yes -C tools install
    1.34  
    1.35  kernels: $(addsuffix -build,$(XKERNELS))
    1.36  
     2.1 --- a/buildconfigs/mk.linux-2.4-xen0	Sat Jan 22 21:54:34 2005 +0000
     2.2 +++ b/buildconfigs/mk.linux-2.4-xen0	Sat Jan 22 22:03:34 2005 +0000
     2.3 @@ -15,9 +15,9 @@ include buildconfigs/Rules.mk
     2.4  build: $(LINUX_DIR)/include/linux/autoconf.h
     2.5  	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \
     2.6  	    $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \
     2.7 -	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install ; \
     2.8 +	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \
     2.9  	fi
    2.10 -	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
    2.11 +	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
    2.12  
    2.13  patches/tmp/ebtables.diff:
    2.14  	mkdir -p patches/tmp
     3.1 --- a/buildconfigs/mk.linux-2.4-xenU	Sat Jan 22 21:54:34 2005 +0000
     3.2 +++ b/buildconfigs/mk.linux-2.4-xenU	Sat Jan 22 22:03:34 2005 +0000
     3.3 @@ -15,9 +15,9 @@ include buildconfigs/Rules.mk
     3.4  build: $(LINUX_DIR)/include/linux/autoconf.h
     3.5  	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \
     3.6  	    $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \
     3.7 -	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install ; \
     3.8 +	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \
     3.9  	fi
    3.10 -	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
    3.11 +	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
    3.12  
    3.13  $(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)
    3.14  	rm -rf $(LINUX_DIR)
     4.1 --- a/buildconfigs/mk.linux-2.6-xen0	Sat Jan 22 21:54:34 2005 +0000
     4.2 +++ b/buildconfigs/mk.linux-2.6-xen0	Sat Jan 22 22:03:34 2005 +0000
     4.3 @@ -15,9 +15,9 @@ include buildconfigs/Rules.mk
     4.4  build: $(LINUX_DIR)/include/linux/autoconf.h
     4.5  	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \
     4.6  	    $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \
     4.7 -	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install ; \
     4.8 +	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \
     4.9  	fi
    4.10 -	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
    4.11 +	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
    4.12  
    4.13  $(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)
    4.14  	rm -rf $(LINUX_DIR)
     5.1 --- a/buildconfigs/mk.linux-2.6-xenU	Sat Jan 22 21:54:34 2005 +0000
     5.2 +++ b/buildconfigs/mk.linux-2.6-xenU	Sat Jan 22 22:03:34 2005 +0000
     5.3 @@ -15,9 +15,9 @@ include buildconfigs/Rules.mk
     5.4  build: $(LINUX_DIR)/include/linux/autoconf.h
     5.5  	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \
     5.6  	    $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \
     5.7 -	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install ; \
     5.8 +	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \
     5.9  	fi
    5.10 -	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
    5.11 +	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
    5.12  
    5.13  $(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)
    5.14  	rm -rf $(LINUX_DIR)
     6.1 --- a/docs/Makefile	Sat Jan 22 21:54:34 2005 +0000
     6.2 +++ b/docs/Makefile	Sat Jan 22 22:03:34 2005 +0000
     6.3 @@ -11,7 +11,8 @@ TGIF		:= tgif
     6.4  LATEX2HTML	:= latex2html
     6.5  
     6.6  package		= xen
     6.7 -docdir		= /usr/share/doc
     6.8 +prefix		= /usr
     6.9 +docdir		= $(prefix)/share/doc
    6.10  pkgdocdir	= $(docdir)/$(package)
    6.11  
    6.12  DOC_TEX		:= $(wildcard src/*.tex)
    6.13 @@ -37,11 +38,11 @@ clean:
    6.14  	rm -rf $(GFX) ps pdf html
    6.15  
    6.16  install: all
    6.17 -	rm -rf $(prefix)$(pkgdocdir)
    6.18 -	$(INSTALL_DIR) $(prefix)$(pkgdocdir)
    6.19 -	cp -dR ps $(prefix)$(pkgdocdir)
    6.20 -	cp -dR pdf $(prefix)$(pkgdocdir)
    6.21 -	cp -dR html $(prefix)$(pkgdocdir)
    6.22 +	rm -rf $(DESTDIR)$(pkgdocdir)
    6.23 +	$(INSTALL_DIR) $(DESTDIR)$(pkgdocdir)
    6.24 +	cp -dR ps $(DESTDIR)$(pkgdocdir)
    6.25 +	cp -dR pdf $(DESTDIR)$(pkgdocdir)
    6.26 +	cp -dR html $(DESTDIR)$(pkgdocdir)
    6.27  
    6.28  pdf/%.pdf: ps/%.ps
    6.29  	$(INSTALL_DIR) $(@D)
     7.1 --- a/tools/examples/Makefile	Sat Jan 22 21:54:34 2005 +0000
     7.2 +++ b/tools/examples/Makefile	Sat Jan 22 22:03:34 2005 +0000
     7.3 @@ -25,23 +25,23 @@ all:
     7.4  install: all install-initd install-configs install-scripts
     7.5  
     7.6  install-initd:
     7.7 -	$(INSTALL_DIR) $(prefix)/etc/init.d
     7.8 -	$(INSTALL_PROG) $(XEND_INITD) $(prefix)/etc/init.d
     7.9 -	$(INSTALL_PROG) $(XENDOMAINS_INITD) $(prefix)/etc/init.d
    7.10 +	$(INSTALL_DIR) $(DESTDIR)/etc/init.d
    7.11 +	$(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)/etc/init.d
    7.12 +	$(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)/etc/init.d
    7.13  
    7.14  install-configs:
    7.15 -	$(INSTALL_DIR) $(prefix)$(XEN_CONFIG_DIR)
    7.16 -	$(INSTALL_DIR) $(prefix)$(XEN_CONFIG_DIR)/auto
    7.17 +	$(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR)
    7.18 +	$(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR)/auto
    7.19  	for i in $(XEN_CONFIGS); \
    7.20 -	    do [ -a $(prefix)/$(XEN_CONFIG_DIR)/$$i ] || \
    7.21 -	    $(INSTALL_DATA) $$i $(prefix)$(XEN_CONFIG_DIR); \
    7.22 +	    do [ -a $(DESTDIR)/$(XEN_CONFIG_DIR)/$$i ] || \
    7.23 +	    $(INSTALL_DATA) $$i $(DESTDIR)$(XEN_CONFIG_DIR); \
    7.24  	done
    7.25  
    7.26  install-scripts:
    7.27 -	$(INSTALL_DIR) $(prefix)$(XEN_SCRIPT_DIR)
    7.28 +	$(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR)
    7.29  	for i in $(XEN_SCRIPTS); \
    7.30 -	    do [ -a $(prefix)/$()/$$i ] || \
    7.31 -	    $(INSTALL_PROG) $$i $(prefix)$(XEN_SCRIPT_DIR); \
    7.32 +	    do [ -a $(DESTDIR)/$()/$$i ] || \
    7.33 +	    $(INSTALL_PROG) $$i $(DESTDIR)$(XEN_SCRIPT_DIR); \
    7.34  	done
    7.35  
    7.36  clean:
     8.1 --- a/tools/libxc/Makefile	Sat Jan 22 21:54:34 2005 +0000
     8.2 +++ b/tools/libxc/Makefile	Sat Jan 22 22:03:34 2005 +0000
     8.3 @@ -68,12 +68,12 @@ mk-symlinks:
     8.4  	  ln -sf ../../$(LINUX_ROOT)/include/asm-xen/linux-public/*.h . )
     8.5  
     8.6  install: all
     8.7 -	$(INSTALL_DIR) $(prefix)/usr/lib
     8.8 -	$(INSTALL_DIR) $(prefix)/usr/include
     8.9 -	$(INSTALL_PROG) $(LIB) $(prefix)/usr/lib
    8.10 -	ln -sf $(LIB_NAME).so.$(MAJOR).$(MINOR) $(prefix)/usr/lib/$(LIB_NAME).so.$(MAJOR)
    8.11 -	ln -sf $(LIB_NAME).so.$(MAJOR) $(prefix)/usr/lib/$(LIB_NAME).so
    8.12 -	$(INSTALL_DATA) xc.h $(prefix)/usr/include
    8.13 +	$(INSTALL_DIR) $(DESTDIR)/usr/lib
    8.14 +	$(INSTALL_DIR) $(DESTDIR)/usr/include
    8.15 +	$(INSTALL_PROG) $(LIB) $(DESTDIR)/usr/lib
    8.16 +	ln -sf $(LIB_NAME).so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib/$(LIB_NAME).so.$(MAJOR)
    8.17 +	ln -sf $(LIB_NAME).so.$(MAJOR) $(DESTDIR)/usr/lib/$(LIB_NAME).so
    8.18 +	$(INSTALL_DATA) xc.h $(DESTDIR)/usr/include
    8.19  
    8.20  clean:
    8.21  	rm -rf *.a *.so *.o *.opic *.rpm $(LIB) *~ $(DEPS) xen
     9.1 --- a/tools/libxutil/Makefile	Sat Jan 22 21:54:34 2005 +0000
     9.2 +++ b/tools/libxutil/Makefile	Sat Jan 22 22:03:34 2005 +0000
     9.3 @@ -72,10 +72,10 @@ check-for-zlib:
     9.4  	fi
     9.5  
     9.6  install: all
     9.7 -	$(INSTALL_DIR) -p $(prefix)/usr/lib
     9.8 -	$(INSTALL_PROG) $(LIB) $(prefix)/usr/lib
     9.9 -	ln -sf $(LIB_NAME).so.$(MAJOR).$(MINOR) $(prefix)/usr/lib/$(LIB_NAME).so.$(MAJOR)
    9.10 -	ln -sf $(LIB_NAME).so.$(MAJOR) $(prefix)/usr/lib/$(LIB_NAME).so
    9.11 +	$(INSTALL_DIR) -p $(DESTDIR)/usr/lib
    9.12 +	$(INSTALL_PROG) $(LIB) $(DESTDIR)/usr/lib
    9.13 +	ln -sf $(LIB_NAME).so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib/$(LIB_NAME).so.$(MAJOR)
    9.14 +	ln -sf $(LIB_NAME).so.$(MAJOR) $(DESTDIR)/usr/lib/$(LIB_NAME).so
    9.15  
    9.16  clean:
    9.17  	$(RM) *.a *.so *.so.* *.o *.opic *.rpm 
    10.1 --- a/tools/misc/Makefile	Sat Jan 22 21:54:34 2005 +0000
    10.2 +++ b/tools/misc/Makefile	Sat Jan 22 22:03:34 2005 +0000
    10.3 @@ -23,10 +23,10 @@ all: $(TARGETS)
    10.4  	$(MAKE) -C miniterm
    10.5  
    10.6  install: all
    10.7 -	$(INSTALL_DIR) $(prefix)/usr/bin
    10.8 -	$(INSTALL_DIR) $(prefix)/usr/sbin
    10.9 -	$(INSTALL_PROG) $(INSTALL_BIN) $(prefix)/usr/bin
   10.10 -	$(INSTALL_PROG) $(INSTALL_SBIN) $(prefix)/usr/sbin
   10.11 +	$(INSTALL_DIR) $(DESTDIR)/usr/bin
   10.12 +	$(INSTALL_DIR) $(DESTDIR)/usr/sbin
   10.13 +	$(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)/usr/bin
   10.14 +	$(INSTALL_PROG) $(INSTALL_SBIN) $(DESTDIR)/usr/sbin
   10.15  	$(MAKE) -C miniterm install
   10.16  
   10.17  clean:
    11.1 --- a/tools/misc/miniterm/Makefile	Sat Jan 22 21:54:34 2005 +0000
    11.2 +++ b/tools/misc/miniterm/Makefile	Sat Jan 22 22:03:34 2005 +0000
    11.3 @@ -9,8 +9,8 @@ TARGET = miniterm
    11.4  all: $(TARGET)
    11.5  
    11.6  install: all
    11.7 -	$(INSTALL_DIR) $(prefix)/usr/bin
    11.8 -	$(INSTALL_PROG) $(TARGET) $(prefix)/usr/bin
    11.9 +	$(INSTALL_DIR) $(DESTDIR)/usr/bin
   11.10 +	$(INSTALL_PROG) $(TARGET) $(DESTDIR)/usr/bin
   11.11  
   11.12  clean:
   11.13  	$(RM) *.o $(TARGET) *~
    12.1 --- a/tools/python/Makefile	Sat Jan 22 21:54:34 2005 +0000
    12.2 +++ b/tools/python/Makefile	Sat Jan 22 22:03:34 2005 +0000
    12.3 @@ -3,7 +3,11 @@ all:
    12.4  	python setup.py build
    12.5  
    12.6  install: all
    12.7 -	python setup.py install --home="$(prefix)/usr"
    12.8 +	if [ "$(DESTDIR)" = "" ]; then                   \
    12.9 +	    python setup.py install;                     \
   12.10 +	else                                             \
   12.11 +	    python setup.py install --root="$(DESTDIR)"; \
   12.12 +	fi
   12.13  
   12.14  clean:
   12.15  	rm -rf build *.pyc *.pyo *.o *.a *~
    13.1 --- a/tools/sv/Makefile	Sat Jan 22 21:54:34 2005 +0000
    13.2 +++ b/tools/sv/Makefile	Sat Jan 22 22:03:34 2005 +0000
    13.3 @@ -1,4 +1,4 @@
    13.4 -sv_insdir	:= $(prefix)/var/lib/xen/sv
    13.5 +sv_insdir := /var/lib/xen/sv
    13.6  INSTALL		= install
    13.7  INSTALL_DIR	= $(INSTALL) -d -m0755
    13.8  INSTALL_DATA	= $(INSTALL) -m0644
    13.9 @@ -17,16 +17,16 @@ IMAGES	+= next.png previous.png finish.p
   13.10  
   13.11  install:
   13.12  	# copy XenSV Main.rpy file
   13.13 -	@$(INSTALL_DIR) $(sv_insdir)
   13.14 -	@$(INSTALL_DATA) Main.rpy $(sv_insdir)
   13.15 +	@$(INSTALL_DIR) $(DESTDIR)$(sv_insdir)
   13.16 +	@$(INSTALL_DATA) Main.rpy $(DESTDIR)$(sv_insdir)
   13.17  
   13.18  	# copy XenSV images
   13.19 -	@($(INSTALL_DIR) $(sv_insdir)/images
   13.20 -	@(cd images && $(INSTALL_DATA) $(IMAGES) $(sv_insdir)/images)
   13.21 +	@$(INSTALL_DIR) $(DESTDIR)$(sv_insdir)/images
   13.22 +	@(cd images && $(INSTALL_DATA) $(IMAGES) $(DESTDIR)$(sv_insdir)/images)
   13.23  
   13.24  	# copy XenSV stylesheet
   13.25 -	@$(INSTALL_DIR) $(sv_insdir)/inc
   13.26 -	@$(INSTALL_DATA) inc/style.css inc/script.js $(sv_insdir)/inc
   13.27 +	@$(INSTALL_DIR) $(DESTDIR)$(sv_insdir)/inc
   13.28 +	@$(INSTALL_DATA) inc/style.css inc/script.js $(DESTDIR)$(sv_insdir)/inc
   13.29  
   13.30  clean:
   13.31  
    14.1 --- a/tools/xentrace/Makefile	Sat Jan 22 21:54:34 2005 +0000
    14.2 +++ b/tools/xentrace/Makefile	Sat Jan 22 22:03:34 2005 +0000
    14.3 @@ -24,12 +24,12 @@ MAN8     = $(wildcard *.8)
    14.4  all: $(BIN)
    14.5  
    14.6  install: all
    14.7 -	$(INSTALL_DIR) $(prefix)/usr/bin
    14.8 -	$(INSTALL_DIR) $(prefix)/usr/man/man1
    14.9 -	$(INSTALL_DIR) $(prefix)/usr/man/man8
   14.10 -	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(prefix)/usr/bin
   14.11 -	$(INSTALL_DATA) $(MAN1) $(prefix)/usr/man/man1
   14.12 -	$(INSTALL_DATA) $(MAN8) $(prefix)/usr/man/man8
   14.13 +	$(INSTALL_DIR) $(DESTDIR)/usr/bin
   14.14 +	$(INSTALL_DIR) $(DESTDIR)/usr/man/man1
   14.15 +	$(INSTALL_DIR) $(DESTDIR)/usr/man/man8
   14.16 +	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin
   14.17 +	$(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/man/man1
   14.18 +	$(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/man/man8
   14.19  
   14.20  clean:
   14.21  	$(RM) *.a *.so *.o *.rpm $(BIN)
    15.1 --- a/tools/xfrd/Makefile	Sat Jan 22 21:54:34 2005 +0000
    15.2 +++ b/tools/xfrd/Makefile	Sat Jan 22 22:03:34 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) $(prefix)/$(XFRD_INSTALL_DIR)
    15.8 -	$(INSTALL_PROG) xfrd $(prefix)/$(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	Sat Jan 22 21:54:34 2005 +0000
    16.2 +++ b/xen/Makefile	Sat Jan 22 22:03:34 2005 +0000
    16.3 @@ -8,7 +8,8 @@ export XEN_VERSION       = 2
    16.4  export XEN_SUBVERSION    = 0
    16.5  export XEN_EXTRAVERSION  = ""
    16.6  
    16.7 -export BASEDIR          := $(shell pwd)
    16.8 +export BASEDIR          := $(CURDIR)
    16.9 +DESTDIR			:= $(CURDIR)/../dist/install
   16.10  
   16.11  include Rules.mk
   16.12  
   16.13 @@ -21,16 +22,15 @@ debug:
   16.14  	objdump -D -S $(TARGET)-syms > $(TARGET).s
   16.15  
   16.16  install: $(TARGET).gz
   16.17 -	$(INSTALL_DIR) $(prefix)/boot
   16.18 -	$(INSTALL_DATA) $(TARGET).gz $(prefix)/boot
   16.19 -	$(INSTALL_DATA) $(TARGET)-syms $(prefix)/boot
   16.20 -	$(INSTALL_DIR) $(prefix)/usr/include/xen/io
   16.21 -	$(INSTALL_DATA) include/public/*.h $(prefix)/usr/include/xen
   16.22 -	$(INSTALL_DATA) include/public/io/*.h $(prefix)/usr/include/xen/io
   16.23 -	$(INSTALL_DATA) include/public/COPYING $(prefix)/usr/include/xen
   16.24 +	$(INSTALL_DIR) $(DESTDIR)/boot
   16.25 +	$(INSTALL_DATA) $(TARGET).gz $(DESTDIR)/boot
   16.26 +	$(INSTALL_DATA) $(TARGET)-syms $(DESTDIR)/boot
   16.27 +	$(INSTALL_DIR) $(DESTDIR)/usr/include/xen/io
   16.28 +	$(INSTALL_DATA) include/public/*.h $(DESTDIR)/usr/include/xen
   16.29 +	$(INSTALL_DATA) include/public/io/*.h $(DESTDIR)/usr/include/xen/io
   16.30 +	$(INSTALL_DATA) include/public/COPYING $(DESTDIR)/usr/include/xen
   16.31  
   16.32 -dist: $(TARGET)
   16.33 -	$(MAKE) prefix=`pwd`/../dist/install dist=yes install
   16.34 +dist: install
   16.35  
   16.36  clean: tools.clean common.clean drivers.clean arch/$(TARGET_ARCH).clean
   16.37  	rm -f include/asm *.o $(TARGET)* *~ core include/xen/compile.h