Attachment #52424 for bug #70161

Lines 198-206 Link Here

(-)xen-2.0/ChangeLog (-2 / +2 lines)
198	Signed-off-by: ian.pratt@cl.cam.ac.uk	198	Signed-off-by: ian.pratt@cl.cam.ac.uk
199		199
200	ChangeSet@1.1676, 2005-01-22 22:03:34+00:00, iap10@labyrinth.cl.cam.ac.uk	200	ChangeSet@1.1676, 2005-01-22 22:03:34+00:00, iap10@labyrinth.cl.cam.ac.uk
201	Description: use DESTDIR correctly	201	Description: use XENDESTDIR correctly
202	Standard makefiles always attempt to install to the root(/). Setting	202	Standard makefiles always attempt to install to the root(/). Setting
203	DESTDIR is the normal way to install to an alternative location.	203	XENDESTDIR is the normal way to install to an alternative location.
204	Setting prefix has the possibility of breaking programs, as the prefix	204	Setting prefix has the possibility of breaking programs, as the prefix
205	may have been embedded inside a compiled binary.	205	may have been embedded inside a compiled binary.
206		206




#

# Default is to install to local 'dist' directory.
XENDISTDIR ?= $(CURDIR)/dist
XENDESTDIR ?= $(XENDISTDIR)/install

INSTALL		:= install
INSTALL_DIR	:= $(INSTALL) -d -m0755

ALLSPARSETREES = $(patsubst %-xen-sparse,%,$(wildcard *-xen-sparse))
XKERNELS := $(foreach kernel, $(KERNELS), $(patsubst buildconfigs/mk.%,%,$(wildcard buildconfigs/mk.$(kernel))) )

export XENDESTDIR

# Export target architecture overrides to Xen and Linux sub-trees.
ifneq ($(TARGET_ARCH),)


# build and install everything into local dist directory
dist: xen tools kernels docs
	$(INSTALL_DIR) $(XENDISTDIR)/check
	$(INSTALL_DATA) ./COPYING $(XENDISTDIR)
	$(INSTALL_DATA) ./README $(XENDISTDIR)
	$(INSTALL_PROG) ./install.sh $(XENDISTDIR)
	$(INSTALL_PROG) tools/check/chk tools/check/check_* $(XENDISTDIR)/check

xen:
	$(MAKE) -C xen install

	tar -jxf iptables-1.2.11.tar.bz2
	$(MAKE) -C iptables-1.2.11 PREFIX= KERNEL_DIR=../linux-$(LINUX_VER)-xen0 install

install-%: XENDESTDIR=
install-%: %
	@: # do nothing


	@echo '                     with extreme care!)'

# Use this target with extreme care!
uninstall: XENDESTDIR=
uninstall: D=$(XENDESTDIR)
uninstall:
	[ ! -d $(D)/etc/xen ] || mv -f $(D)/etc/xen $(D)/etc/xen.old
	rm -rf $(D)/etc/init.d/xend*

Lines 1-8 Link Here

(-)xen-2.0/buildconfigs/Rules.mk (-2 / +2 lines)
1		1
2	# We expect these two to already be set if people	2	# We expect these two to already be set if people
3	# are using the top-level Makefile	3	# are using the top-level Makefile
4	DISTDIR ?= $(CURDIR)/dist	4	XENDISTDIR ?= $(CURDIR)/dist
5	DESTDIR ?= $(DISTDIR)/install	5	XENDESTDIR ?= $(XENDISTDIR)/install
6		6
7	.PHONY: mkpatches mrproper	7	.PHONY: mkpatches mrproper
8		8




build: $(LINUX_DIR)/include/linux/autoconf.h
	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \
	    $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \
	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(XENDESTDIR) modules_install ; \
	fi
	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(XENDESTDIR) install

patches/tmp/ebtables.diff:
	mkdir -p patches/tmp

	# add ebtables patch
	( cd $(LINUX_DIR) ; patch -p1 -F3 < ../patches/tmp/ebtables.diff )
	# Re-use config from install dir if one exits else use default config
	[ -r $(XENDESTDIR)/boot/config-$(FULLVERSION) ] && \
	  cp $(XENDESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
	  || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \
		$(LINUX_DIR)/.config
	make -C $(LINUX_DIR) ARCH=xen oldconfig




build: $(LINUX_DIR)/include/linux/autoconf.h
	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \
	    $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \
	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(XENDESTDIR) modules_install ; \
	fi
	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(XENDESTDIR) install

$(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)
	rm -rf $(LINUX_DIR)

	  sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
	  rm -f Makefile ; mv Mk.tmp Makefile )
	# Re-use config from install dir if one exits else use default config
	[ -r $(XENDESTDIR)/boot/config-$(FULLVERSION) ] && \
	  cp $(XENDESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
	  || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \
		$(LINUX_DIR)/.config
	make -C $(LINUX_DIR) ARCH=xen oldconfig




build: $(LINUX_DIR)/include/linux/autoconf.h
	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \
	    $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \
	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(XENDESTDIR) modules_install ; \
	fi
	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(XENDESTDIR) install

$(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)
	rm -rf $(LINUX_DIR)

	  sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
	  rm -f Makefile ; mv Mk.tmp Makefile )
	# Re-use config from install dir if one exits else use default config
	[ -r $(XENDESTDIR)/boot/config-$(FULLVERSION) ] && \
	  cp $(XENDESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
	  || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
		$(LINUX_DIR)/.config
	$(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig




build: $(LINUX_DIR)/include/linux/autoconf.h
	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \
	    $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \
	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(XENDESTDIR) modules_install ; \
	fi
	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(XENDESTDIR) install

$(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)
	rm -rf $(LINUX_DIR)

	  sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
	  rm -f Makefile ; mv Mk.tmp Makefile )
	# Re-use config from install dir if one exits else use default config
	[ -r $(XENDESTDIR)/boot/config-$(FULLVERSION) ] && \
	  cp $(XENDESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
	  || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
		$(LINUX_DIR)/.config
	$(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig

Lines 34-40 Link Here

(-)xen-2.0/buildconfigs/mk.netbsd-2.0-xenU (-1 / +1 lines)
34	netbsd-xen%: $(NETBSD_DIR)/.valid netbsd-$(NETBSD_RELEASE)-tools	34	netbsd-xen%: $(NETBSD_DIR)/.valid netbsd-$(NETBSD_RELEASE)-tools
35	$(MAKE) -C netbsd-$(FULLVERSION) config	35	$(MAKE) -C netbsd-$(FULLVERSION) config
36	$(MAKE) -C netbsd-$(FULLVERSION) netbsd	36	$(MAKE) -C netbsd-$(FULLVERSION) netbsd
37	$(MAKE) -C netbsd-$(FULLVERSION) INSTALL_PATH=$(DESTDIR) INSTALL_NAME=boot/netbsd-$(NETBSD_VER)-xen$* install	37	$(MAKE) -C netbsd-$(FULLVERSION) INSTALL_PATH=$(XENDESTDIR) INSTALL_NAME=boot/netbsd-$(NETBSD_VER)-xen$* install
38		38
39	clean:	39	clean:
40	$(MAKE) -C netbsd-$(FULLVERSION) clean	40	$(MAKE) -C netbsd-$(FULLVERSION) clean

Lines 35-45 Link Here

(-)xen-2.0/docs/Makefile (-5 / +5 lines)
35	rm -rf $(GFX) ps pdf html	35	rm -rf $(GFX) ps pdf html
36		36
37	install: all	37	install: all
38	rm -rf $(DESTDIR)$(pkgdocdir)	38	rm -rf $(XENDESTDIR)$(pkgdocdir)
39	$(INSTALL_DIR) $(DESTDIR)$(pkgdocdir)	39	$(INSTALL_DIR) $(XENDESTDIR)$(pkgdocdir)
40	cp -dR ps $(DESTDIR)$(pkgdocdir)	40	cp -dR ps $(XENDESTDIR)$(pkgdocdir)
41	cp -dR pdf $(DESTDIR)$(pkgdocdir)	41	cp -dR pdf $(XENDESTDIR)$(pkgdocdir)
42	cp -dR html $(DESTDIR)$(pkgdocdir)	42	cp -dR html $(XENDESTDIR)$(pkgdocdir)
43		43
44	pdf/%.pdf: ps/%.ps	44	pdf/%.pdf: ps/%.ps
45	$(INSTALL_DIR) $(@D)	45	$(INSTALL_DIR) $(@D)

Lines 49-55 Link Here

(-)xen-2.0/linux-2.4.29-xen-sparse/drivers/scsi/aic7xxx/Makefile (-1 / +1 lines)
49	endif	49	endif
50		50
51	# Override our module desitnation	51	# Override our module desitnation
52	MOD_DESTDIR = $(shell cd .. && $(CONFIG_SHELL) $(TOPDIR)/scripts/pathdown.sh)	52	MOD_XENDESTDIR = $(shell cd .. && $(CONFIG_SHELL) $(TOPDIR)/scripts/pathdown.sh)
53		53
54	include $(TOPDIR)/Rules.make	54	include $(TOPDIR)/Rules.make
55		55

Lines 16-22 Link Here

(-)xen-2.0/netbsd-2.0-xen-sparse/nbmake-xen (-1 / +1 lines)
16	esac	16	esac
17		17
18	NETBSDSRCDIR="$TOPDIR"; export NETBSDSRCDIR	18	NETBSDSRCDIR="$TOPDIR"; export NETBSDSRCDIR
19	DESTDIR="$TOPDIR/root"; export DESTDIR	19	XENDESTDIR="$TOPDIR/root"; export XENDESTDIR
20	unset MAKEOBJDIRPREFIX	20	unset MAKEOBJDIRPREFIX
21	MAKEOBJDIR='${.CURDIR:C,^'"$TOPDIR,$TOPDIR/obj,}"; export MAKEOBJDIR	21	MAKEOBJDIR='${.CURDIR:C,^'"$TOPDIR,$TOPDIR/obj,}"; export MAKEOBJDIR
22	RELEASEDIR="$TOPDIR/release"; export RELEASEDIR	22	RELEASEDIR="$TOPDIR/release"; export RELEASEDIR




# Default is to install to local 'dist' directory.
XENDISTDIR ?= ../dist
XENDESTDIR ?= $(XENDISTDIR)/install
INSTALL		= install
INSTALL_DIR	= $(INSTALL) -d -m0755
INSTALL_PROG	= $(INSTALL) -m0755

install: all install-initd install-configs install-scripts

install-initd:
	[ -d $(XENDESTDIR)/etc/init.d ] || $(INSTALL_DIR) $(XENDESTDIR)/etc/init.d
	$(INSTALL_PROG) $(XEND_INITD) $(XENDESTDIR)/etc/init.d
	$(INSTALL_PROG) $(XENDOMAINS_INITD) $(XENDESTDIR)/etc/init.d

install-configs:
	[ -d $(XENDESTDIR)$(XEN_CONFIG_DIR) ] || \
		$(INSTALL_DIR) $(XENDESTDIR)$(XEN_CONFIG_DIR)
	[ -d $(XENDESTDIR)$(XEN_CONFIG_DIR)/auto ] || \
		$(INSTALL_DIR) $(XENDESTDIR)$(XEN_CONFIG_DIR)/auto
	for i in $(XEN_CONFIGS); \
	    do [ -a $(XENDESTDIR)$(XEN_CONFIG_DIR)/$$i ] || \
	    $(INSTALL_DATA) $$i $(XENDESTDIR)$(XEN_CONFIG_DIR); \
	done

install-scripts:
	[ -d $(XENDESTDIR)$(XEN_SCRIPT_DIR) ] || \
		$(INSTALL_DIR) $(XENDESTDIR)$(XEN_SCRIPT_DIR)
	for i in $(XEN_SCRIPTS); \
	    do [ -a $(XENDESTDIR)$(XEN_SCRIPT_DIR)/$$i ] || \
	    $(INSTALL_PROG) $$i $(XENDESTDIR)$(XEN_SCRIPT_DIR); \
	done

clean:




# Default is to install to local 'dist' directory.
XENDISTDIR ?= ../dist
XENDESTDIR ?= $(XENDISTDIR)/install
INSTALL		= install
INSTALL_PROG	= $(INSTALL) -m0755
INSTALL_DATA	= $(INSTALL) -m0644

	  ln -sf ../../$(LINUX_ROOT)/include/asm-xen/linux-public/*.h . )

install: all
	[ -d $(XENDESTDIR)/usr/lib ] || $(INSTALL_DIR) $(XENDESTDIR)/usr/lib
	[ -d $(XENDESTDIR)/usr/include ] || $(INSTALL_DIR) $(XENDESTDIR)/usr/include
	$(INSTALL_PROG) libxc.so.$(MAJOR).$(MINOR) $(XENDESTDIR)/usr/lib
	ln -sf libxc.so.$(MAJOR).$(MINOR) $(XENDESTDIR)/usr/lib/libxc.so.$(MAJOR)
	ln -sf libxc.so.$(MAJOR) $(XENDESTDIR)/usr/lib/libxc.so
	$(INSTALL_DATA) xc.h $(XENDESTDIR)/usr/include

clean:
	rm -rf *.a *.so *.o *.rpm $(LIB) *~ $(DEPS) xen




# Default is to install to local 'dist' directory.
XENDISTDIR ?= ../dist
XENDESTDIR ?= $(XENDISTDIR)/install
XEN_ROOT = ../..
INSTALL		= install
INSTALL_DATA	= $(INSTALL) -m0644

	fi

install: all
	[ -d $(XENDESTDIR)/usr/lib ] || $(INSTALL_DIR) -p $(XENDESTDIR)/usr/lib
	$(INSTALL_PROG) $(LIB_NAME).so.$(MAJOR).$(MINOR) $(XENDESTDIR)/usr/lib
	ln -sf $(LIB_NAME).so.$(MAJOR).$(MINOR) $(XENDESTDIR)/usr/lib/$(LIB_NAME).so.$(MAJOR)
	ln -sf $(LIB_NAME).so.$(MAJOR) $(XENDESTDIR)/usr/lib/$(LIB_NAME).so

clean:
	$(RM) *.a *.so *.so.* *.o *.rpm 




# Default is to install to local 'dist' directory.
XENDISTDIR ?= ../dist
XENDESTDIR ?= $(XENDISTDIR)/install
INSTALL		= install
INSTALL_PROG	= $(INSTALL) -m0755
INSTALL_DIR	= $(INSTALL) -d -m0755

	$(MAKE) -C miniterm

install: all
	[ -d $(XENDESTDIR)/usr/bin ] || $(INSTALL_DIR) $(XENDESTDIR)/usr/bin
	[ -d $(XENDESTDIR)/usr/sbin ] || $(INSTALL_DIR) $(XENDESTDIR)/usr/sbin
	$(INSTALL_PROG) $(INSTALL_BIN) $(XENDESTDIR)/usr/bin
	$(INSTALL_PROG) $(INSTALL_SBIN) $(XENDESTDIR)/usr/sbin
#       No sense in installing miniterm on the Xen box.
#	$(MAKE) -C miniterm install


Lines 1-3 Link Here

(-)xen-2.0/tools/misc/miniterm/Makefile (-2 / +5 lines)
		1	# Default is to install to local 'dist' directory.
		2	XENDISTDIR ?= ../dist
		3	XENDESTDIR ?= $(XENDISTDIR)/install
1	INSTALL = install	4	INSTALL = install
2	INSTALL_PROG = $(INSTALL) -m0755	5	INSTALL_PROG = $(INSTALL) -m0755
3	INSTALL_DIR = $(INSTALL) -d -m0755	6	INSTALL_DIR = $(INSTALL) -d -m0755
Lines 9-16 Link Here
9	all: $(TARGET)	12	all: $(TARGET)
10		13
11	install: all	14	install: all
12	[ -d $(DESTDIR)/usr/bin ] \|\| $(INSTALL_DIR) $(DESTDIR)/usr/bin	15	[ -d $(XENDESTDIR)/usr/bin ] \|\| $(INSTALL_DIR) $(XENDESTDIR)/usr/bin
13	$(INSTALL_PROG) $(TARGET) $(DESTDIR)/usr/bin	16	$(INSTALL_PROG) $(TARGET) $(XENDESTDIR)/usr/bin
14		17
15	clean:	18	clean:
16	$(RM) .o $(TARGET) ~	19	$(RM) .o $(TARGET) ~

Lines 1-4 Link Here

(-)xen-2.0/tools/python/Makefile (-2 / +4 lines)
1		1	# Default is to install to local 'dist' directory.
		2	XENDISTDIR ?= ../dist
		3	XENDESTDIR ?= $(XENDISTDIR)/install
2	XEN_ROOT = ../..	4	XEN_ROOT = ../..
3	include $(XEN_ROOT)/tools/Rules.mk	5	include $(XEN_ROOT)/tools/Rules.mk
4		6
Lines 6-12 Link Here
6	CFLAGS="$(CFLAGS)" python setup.py build	8	CFLAGS="$(CFLAGS)" python setup.py build
7		9
8	install: all	10	install: all
9	CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)/usr"	11	CFLAGS="$(CFLAGS)" python setup.py install --home="$(XENDESTDIR)/usr"
10		12
11	clean:	13	clean:
12	rm -rf build .pyc .pyo .o .a *~	14	rm -rf build .pyc .pyo .o .a *~




# Default is to install to local 'dist' directory.
XENDISTDIR ?= ../../dist
XENDESTDIR ?= $(XENDISTDIR)/install
sv_insdir := /var/lib/xen/sv
INSTALL		= install
INSTALL_DIR	= $(INSTALL) -d -m0755


install:
	# copy XenSV Main.rpy file
	@[ -d $(XENDESTDIR)$(sv_insdir) ] || $(INSTALL_DIR) $(XENDESTDIR)$(sv_insdir)
	@$(INSTALL_DATA) Main.rpy $(XENDESTDIR)$(sv_insdir)

	# copy XenSV images
	@[ -d $(XENDESTDIR)$(sv_insdir)/images ] || \
		$(INSTALL_DIR) $(XENDESTDIR)$(sv_insdir)/images
	# @(cd images && $(INSTALL_DATA) $(IMAGES) $(XENDESTDIR)$(sv_insdir)/images)

	# copy XenSV stylesheet
	@[ -d $(XENDESTDIR)$(sv_insdir)/inc ] || \
		$(INSTALL_DIR) $(XENDESTDIR)$(sv_insdir)/inc
	@$(INSTALL_DATA) inc/style.css inc/script.js $(XENDESTDIR)$(sv_insdir)/inc

clean:


Lines 6-12 Link Here

(-)xen-2.0/tools/vnet/examples/Makefile (-2 / +2 lines)
6	all:	6	all:
7		7
8	install:	8	install:
9	install -m 0755 -d $(DESTDIR)$(XEN_SCRIPT_DIR)	9	install -m 0755 -d $(XENDESTDIR)$(XEN_SCRIPT_DIR)
10	install -m 0554 network-vnet $(DESTDIR)$(XEN_SCRIPT_DIR)	10	install -m 0554 network-vnet $(XENDESTDIR)$(XEN_SCRIPT_DIR)
11		11
12	clean:	12	clean:

Lines 32-37 Link Here

(-)xen-2.0/tools/vnet/vnet-module/Makefile-2.4 (-2 / +6 lines)
32		32
33	VNET_OBJ += $(VNET_LIB_OBJ)	33	VNET_OBJ += $(VNET_LIB_OBJ)
34		34
		35	# Default is to install to local 'dist' directory.
		36	XENDISTDIR ?= ../dist
		37	XENDESTDIR ?= $(XENDISTDIR)/install
		38
35	#----------------------------------------------------------------------------	39	#----------------------------------------------------------------------------
36		40
37	vpath %.h $(KERNEL_SRC)/include	41	vpath %.h $(KERNEL_SRC)/include
Lines 82-89 Link Here
82		86
83	.PHONY: install install-module modules_install	87	.PHONY: install install-module modules_install
84	install install-module modules_install: module	88	install install-module modules_install: module
85	install -m 0755 -d $(DESTDIR)$(KERNEL_MODULE_DIR)	89	install -m 0755 -d $(XENDESTDIR)$(KERNEL_MODULE_DIR)
86	install -m 0554 $(KERNEL_MODULE) $(DESTDIR)$(KERNEL_MODULE_DIR)	90	install -m 0554 $(KERNEL_MODULE) $(XENDESTDIR)$(KERNEL_MODULE_DIR)
87		91
88	TAGS:	92	TAGS:
89	etags .c .h	93	etags .c .h

Lines 29-34 Link Here

(-)xen-2.0/tools/vnet/vnet-module/Makefile-2.6 (-2 / +6 lines)
29	#----------------------------------------------------------------------------	29	#----------------------------------------------------------------------------
30	#export KBUILD_VERBOSE=1	30	#export KBUILD_VERBOSE=1
31		31
		32	# Default is to install to local 'dist' directory.
		33	XENDISTDIR ?= ../dist
		34	XENDESTDIR ?= $(XENDISTDIR)/install
		35
32	.PHONY: all	36	.PHONY: all
33	all: module	37	all: module
34		38
Lines 38-45 Link Here
38		42
39	.PHONY: install install-module modules_install	43	.PHONY: install install-module modules_install
40	install install-module modules_install: module	44	install install-module modules_install: module
41	install -m 0755 -d $(DESTDIR)$(KERNEL_MODULE_DIR)	45	install -m 0755 -d $(XENDESTDIR)$(KERNEL_MODULE_DIR)
42	install -m 0554 $(KERNEL_MODULE) $(DESTDIR)$(KERNEL_MODULE_DIR)	46	install -m 0554 $(KERNEL_MODULE) $(XENDESTDIR)$(KERNEL_MODULE_DIR)
43		47
44	.PHONY: clean	48	.PHONY: clean
45	clean:	49	clean:

Lines 20-25 Link Here

(-)xen-2.0/tools/vnet/vnetd/Makefile (-2 / +5 lines)
20		20
21	#----------------------------------------------------------------------------	21	#----------------------------------------------------------------------------
22		22
		23	# Default is to install to local 'dist' directory.
		24	XENDISTDIR ?= ../dist
		25	XENDESTDIR ?= $(XENDISTDIR)/install
23	XEN_ROOT = ../../..	26	XEN_ROOT = ../../..
24	include $(XEN_ROOT)/tools/Rules.mk	27	include $(XEN_ROOT)/tools/Rules.mk
25		28
Lines 91-98 Link Here
91	$(CC) $(CFLAGS) -o $@ $^ $(VNETD_LIBS) -ldl -lpthread	94	$(CC) $(CFLAGS) -o $@ $^ $(VNETD_LIBS) -ldl -lpthread
92		95
93	install: vnetd	96	install: vnetd
94	mkdir -p $(DESTDIR)$(VNETD_INSTALL_DIR)	97	mkdir -p $(XENDESTDIR)$(VNETD_INSTALL_DIR)
95	install -m 0755 vnetd $(DESTDIR)$(VNETD_INSTALL_DIR)	98	install -m 0755 vnetd $(XENDESTDIR)$(VNETD_INSTALL_DIR)
96		99
97	clean:	100	clean:
98	-rm -f .a .o *~	101	-rm -f .a .o *~




# Default is to install to local 'dist' directory.
XENDISTDIR ?= ../dist
XENDESTDIR ?= $(XENDISTDIR)/install
INSTALL		= install
INSTALL_PROG	= $(INSTALL) -m0755
INSTALL_DIR	= $(INSTALL) -d -m0755

all: $(BIN)

install: all
	[ -d $(XENDESTDIR)/usr/bin ] || $(INSTALL_DIR) $(XENDESTDIR)/usr/bin
	[ -d $(XENDESTDIR)/usr/man/man1 ] || \
		$(INSTALL_DIR) $(XENDESTDIR)/usr/man/man1
	[ -d $(XENDESTDIR)/usr/man/man8 ] || \
		$(INSTALL_DIR) $(XENDESTDIR)/usr/man/man8
	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(XENDESTDIR)/usr/bin
	$(INSTALL_DATA) $(MAN1) $(XENDESTDIR)/usr/man/man1
	$(INSTALL_DATA) $(MAN8) $(XENDESTDIR)/usr/man/man8

clean:
	$(RM) *.a *.so *.o *.rpm $(BIN)

Lines 4-9 Link Here

(-)xen-2.0/tools/xfrd/Makefile (-3 / +6 lines)
4	# Mike Wray <mike.wray@hp.com>	4	# Mike Wray <mike.wray@hp.com>
5	#============================================================================	5	#============================================================================
6		6
		7	# Default is to install to local 'dist' directory.
		8	XENDISTDIR ?= ../dist
		9	XENDESTDIR ?= $(XENDISTDIR)/install
7	INSTALL = install	10	INSTALL = install
8	INSTALL_PROG = $(INSTALL) -m0755	11	INSTALL_PROG = $(INSTALL) -m0755
9	INSTALL_DIR = $(INSTALL) -d -m0755	12	INSTALL_DIR = $(INSTALL) -d -m0755
Lines 70-78 Link Here
70		73
71	.PHONY: install	74	.PHONY: install
72	install: xfrd	75	install: xfrd
73	[ -d $(DESTDIR)$(XFRD_INSTALL_DIR) ] \|\| \	76	[ -d $(XENDESTDIR)$(XFRD_INSTALL_DIR) ] \|\| \
74	$(INSTALL_DIR) $(DESTDIR)$(XFRD_INSTALL_DIR)	77	$(INSTALL_DIR) $(XENDESTDIR)$(XFRD_INSTALL_DIR)
75	$(INSTALL_PROG) xfrd $(DESTDIR)$(XFRD_INSTALL_DIR)	78	$(INSTALL_PROG) xfrd $(XENDESTDIR)$(XFRD_INSTALL_DIR)
76		79
77	.PHONY: libutil	80	.PHONY: libutil
78	libutil: $(UTIL_LIB)	81	libutil: $(UTIL_LIB)




# Default is to install to local 'dist' directory.
XENDISTDIR ?= ../dist
XENDESTDIR ?= $(XENDISTDIR)/install

INSTALL			= install
INSTALL_DATA		= $(INSTALL) -m0644

	$(MAKE) install

install: $(TARGET).gz
	[ -d $(XENDESTDIR)/boot ] || $(INSTALL_DIR) $(XENDESTDIR)/boot
	$(INSTALL_DATA) $(TARGET).gz $(XENDESTDIR)/boot
	$(INSTALL_DATA) $(TARGET)-syms $(XENDESTDIR)/boot
	[ -d $(XENDESTDIR)/usr/include/xen/io ] || \
		$(INSTALL_DIR) $(XENDESTDIR)/usr/include/xen/io
	$(INSTALL_DATA) include/public/*.h $(XENDESTDIR)/usr/include/xen
	$(INSTALL_DATA) include/public/io/*.h $(XENDESTDIR)/usr/include/xen/io
	$(INSTALL_DATA) include/public/COPYING $(XENDESTDIR)/usr/include/xen

clean:
	$(MAKE) -C tools clean

Return to bug 70161

Lines 3-10 Link Here

(-)xen-2.0/Makefile (-11 / +11 lines)
3	#	3	#
4		4
5	# Default is to install to local 'dist' directory.	5	# Default is to install to local 'dist' directory.
6	DISTDIR ?= $(CURDIR)/dist	6	XENDISTDIR ?= $(CURDIR)/dist
7	DESTDIR ?= $(DISTDIR)/install	7	XENDESTDIR ?= $(XENDISTDIR)/install
8		8
9	INSTALL := install	9	INSTALL := install
10	INSTALL_DIR := $(INSTALL) -d -m0755	10	INSTALL_DIR := $(INSTALL) -d -m0755
Lines 19-25 Link Here
19	ALLSPARSETREES = $(patsubst %-xen-sparse,%,$(wildcard *-xen-sparse))	19	ALLSPARSETREES = $(patsubst %-xen-sparse,%,$(wildcard *-xen-sparse))
20	XKERNELS := $(foreach kernel, $(KERNELS), $(patsubst buildconfigs/mk.%,%,$(wildcard buildconfigs/mk.$(kernel))) )	20	XKERNELS := $(foreach kernel, $(KERNELS), $(patsubst buildconfigs/mk.%,%,$(wildcard buildconfigs/mk.$(kernel))) )
21		21
22	export DESTDIR	22	export XENDESTDIR
23		23
24	# Export target architecture overrides to Xen and Linux sub-trees.	24	# Export target architecture overrides to Xen and Linux sub-trees.
25	ifneq ($(TARGET_ARCH),)	25	ifneq ($(TARGET_ARCH),)
Lines 39-49 Link Here
39		39
40	# build and install everything into local dist directory	40	# build and install everything into local dist directory
41	dist: xen tools kernels docs	41	dist: xen tools kernels docs
42	$(INSTALL_DIR) $(DISTDIR)/check	42	$(INSTALL_DIR) $(XENDISTDIR)/check
43	$(INSTALL_DATA) ./COPYING $(DISTDIR)	43	$(INSTALL_DATA) ./COPYING $(XENDISTDIR)
44	$(INSTALL_DATA) ./README $(DISTDIR)	44	$(INSTALL_DATA) ./README $(XENDISTDIR)
45	$(INSTALL_PROG) ./install.sh $(DISTDIR)	45	$(INSTALL_PROG) ./install.sh $(XENDISTDIR)
46	$(INSTALL_PROG) tools/check/chk tools/check/check_* $(DISTDIR)/check	46	$(INSTALL_PROG) tools/check/chk tools/check/check_* $(XENDISTDIR)/check
47		47
48	xen:	48	xen:
49	$(MAKE) -C xen install	49	$(MAKE) -C xen install
Lines 110-116 Link Here
110	tar -jxf iptables-1.2.11.tar.bz2	110	tar -jxf iptables-1.2.11.tar.bz2
111	$(MAKE) -C iptables-1.2.11 PREFIX= KERNEL_DIR=../linux-$(LINUX_VER)-xen0 install	111	$(MAKE) -C iptables-1.2.11 PREFIX= KERNEL_DIR=../linux-$(LINUX_VER)-xen0 install
112		112
113	install-%: DESTDIR=	113	install-%: XENDESTDIR=
114	install-%: %	114	install-%: %
115	@: # do nothing	115	@: # do nothing
116		116
Lines 152-159 Link Here
152	@echo ' with extreme care!)'	152	@echo ' with extreme care!)'
153		153
154	# Use this target with extreme care!	154	# Use this target with extreme care!
155	uninstall: DESTDIR=	155	uninstall: XENDESTDIR=
156	uninstall: D=$(DESTDIR)	156	uninstall: D=$(XENDESTDIR)
157	uninstall:	157	uninstall:
158	[ ! -d $(D)/etc/xen ] \|\| mv -f $(D)/etc/xen $(D)/etc/xen.old	158	[ ! -d $(D)/etc/xen ] \|\| mv -f $(D)/etc/xen $(D)/etc/xen.old
159	rm -rf $(D)/etc/init.d/xend*	159	rm -rf $(D)/etc/init.d/xend*

Lines 15-23 Link Here

(-)xen-2.0/buildconfigs/mk.linux-2.4-xen0 (-4 / +4 lines)
15	build: $(LINUX_DIR)/include/linux/autoconf.h	15	build: $(LINUX_DIR)/include/linux/autoconf.h
16	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \	16	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \
17	$(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \	17	$(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \
18	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \	18	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(XENDESTDIR) modules_install ; \
19	fi	19	fi
20	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install	20	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(XENDESTDIR) install
21		21
22	patches/tmp/ebtables.diff:	22	patches/tmp/ebtables.diff:
23	mkdir -p patches/tmp	23	mkdir -p patches/tmp
Lines 37-44 Link Here
37	# add ebtables patch	37	# add ebtables patch
38	( cd $(LINUX_DIR) ; patch -p1 -F3 < ../patches/tmp/ebtables.diff )	38	( cd $(LINUX_DIR) ; patch -p1 -F3 < ../patches/tmp/ebtables.diff )
39	# Re-use config from install dir if one exits else use default config	39	# Re-use config from install dir if one exits else use default config
40	[ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \	40	[ -r $(XENDESTDIR)/boot/config-$(FULLVERSION) ] && \
41	cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \	41	cp $(XENDESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
42	\|\| cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \	42	\|\| cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \
43	$(LINUX_DIR)/.config	43	$(LINUX_DIR)/.config
44	make -C $(LINUX_DIR) ARCH=xen oldconfig	44	make -C $(LINUX_DIR) ARCH=xen oldconfig

Lines 15-23 Link Here

(-)xen-2.0/buildconfigs/mk.linux-2.6-xen0 (-4 / +4 lines)
15	build: $(LINUX_DIR)/include/linux/autoconf.h	15	build: $(LINUX_DIR)/include/linux/autoconf.h
16	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \	16	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \
17	$(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \	17	$(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \
18	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \	18	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(XENDESTDIR) modules_install ; \
19	fi	19	fi
20	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install	20	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(XENDESTDIR) install
21		21
22	$(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)	22	$(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)
23	rm -rf $(LINUX_DIR)	23	rm -rf $(LINUX_DIR)
Lines 30-37 Link Here
30	sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \	30	sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
31	rm -f Makefile ; mv Mk.tmp Makefile )	31	rm -f Makefile ; mv Mk.tmp Makefile )
32	# Re-use config from install dir if one exits else use default config	32	# Re-use config from install dir if one exits else use default config
33	[ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \	33	[ -r $(XENDESTDIR)/boot/config-$(FULLVERSION) ] && \
34	cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \	34	cp $(XENDESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
35	\|\| cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \	35	\|\| cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
36	$(LINUX_DIR)/.config	36	$(LINUX_DIR)/.config
37	$(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig	37	$(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig

Lines 1-3 Link Here

(-)xen-2.0/tools/examples/Makefile (-13 / +16 lines)
		1	# Default is to install to local 'dist' directory.
		2	XENDISTDIR ?= ../dist
		3	XENDESTDIR ?= $(XENDISTDIR)/install
1	INSTALL = install	4	INSTALL = install
2	INSTALL_DIR = $(INSTALL) -d -m0755	5	INSTALL_DIR = $(INSTALL) -d -m0755
3	INSTALL_PROG = $(INSTALL) -m0755	6	INSTALL_PROG = $(INSTALL) -m0755
Lines 25-50 Link Here
25	install: all install-initd install-configs install-scripts	28	install: all install-initd install-configs install-scripts
26		29
27	install-initd:	30	install-initd:
28	[ -d $(DESTDIR)/etc/init.d ] \|\| $(INSTALL_DIR) $(DESTDIR)/etc/init.d	31	[ -d $(XENDESTDIR)/etc/init.d ] \|\| $(INSTALL_DIR) $(XENDESTDIR)/etc/init.d
29	$(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)/etc/init.d	32	$(INSTALL_PROG) $(XEND_INITD) $(XENDESTDIR)/etc/init.d
30	$(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)/etc/init.d	33	$(INSTALL_PROG) $(XENDOMAINS_INITD) $(XENDESTDIR)/etc/init.d
31		34
32	install-configs:	35	install-configs:
33	[ -d $(DESTDIR)$(XEN_CONFIG_DIR) ] \|\| \	36	[ -d $(XENDESTDIR)$(XEN_CONFIG_DIR) ] \|\| \
34	$(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR)	37	$(INSTALL_DIR) $(XENDESTDIR)$(XEN_CONFIG_DIR)
35	[ -d $(DESTDIR)$(XEN_CONFIG_DIR)/auto ] \|\| \	38	[ -d $(XENDESTDIR)$(XEN_CONFIG_DIR)/auto ] \|\| \
36	$(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR)/auto	39	$(INSTALL_DIR) $(XENDESTDIR)$(XEN_CONFIG_DIR)/auto
37	for i in $(XEN_CONFIGS); \	40	for i in $(XEN_CONFIGS); \
38	do [ -a $(DESTDIR)$(XEN_CONFIG_DIR)/$$i ] \|\| \	41	do [ -a $(XENDESTDIR)$(XEN_CONFIG_DIR)/$$i ] \|\| \
39	$(INSTALL_DATA) $$i $(DESTDIR)$(XEN_CONFIG_DIR); \	42	$(INSTALL_DATA) $$i $(XENDESTDIR)$(XEN_CONFIG_DIR); \
40	done	43	done
41		44
42	install-scripts:	45	install-scripts:
43	[ -d $(DESTDIR)$(XEN_SCRIPT_DIR) ] \|\| \	46	[ -d $(XENDESTDIR)$(XEN_SCRIPT_DIR) ] \|\| \
44	$(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR)	47	$(INSTALL_DIR) $(XENDESTDIR)$(XEN_SCRIPT_DIR)
45	for i in $(XEN_SCRIPTS); \	48	for i in $(XEN_SCRIPTS); \
46	do [ -a $(DESTDIR)$(XEN_SCRIPT_DIR)/$$i ] \|\| \	49	do [ -a $(XENDESTDIR)$(XEN_SCRIPT_DIR)/$$i ] \|\| \
47	$(INSTALL_PROG) $$i $(DESTDIR)$(XEN_SCRIPT_DIR); \	50	$(INSTALL_PROG) $$i $(XENDESTDIR)$(XEN_SCRIPT_DIR); \
48	done	51	done
49		52
50	clean:	53	clean:

Lines 1-3 Link Here

(-)xen-2.0/tools/libxc/Makefile (-6 / +9 lines)
		1	# Default is to install to local 'dist' directory.
		2	XENDISTDIR ?= ../dist
		3	XENDESTDIR ?= $(XENDISTDIR)/install
1	INSTALL = install	4	INSTALL = install
2	INSTALL_PROG = $(INSTALL) -m0755	5	INSTALL_PROG = $(INSTALL) -m0755
3	INSTALL_DATA = $(INSTALL) -m0644	6	INSTALL_DATA = $(INSTALL) -m0644
Lines 66-77 Link Here
66	ln -sf ../../$(LINUX_ROOT)/include/asm-xen/linux-public/*.h . )	69	ln -sf ../../$(LINUX_ROOT)/include/asm-xen/linux-public/*.h . )
67		70
68	install: all	71	install: all
69	[ -d $(DESTDIR)/usr/lib ] \|\| $(INSTALL_DIR) $(DESTDIR)/usr/lib	72	[ -d $(XENDESTDIR)/usr/lib ] \|\| $(INSTALL_DIR) $(XENDESTDIR)/usr/lib
70	[ -d $(DESTDIR)/usr/include ] \|\| $(INSTALL_DIR) $(DESTDIR)/usr/include	73	[ -d $(XENDESTDIR)/usr/include ] \|\| $(INSTALL_DIR) $(XENDESTDIR)/usr/include
71	$(INSTALL_PROG) libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib	74	$(INSTALL_PROG) libxc.so.$(MAJOR).$(MINOR) $(XENDESTDIR)/usr/lib
72	ln -sf libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib/libxc.so.$(MAJOR)	75	ln -sf libxc.so.$(MAJOR).$(MINOR) $(XENDESTDIR)/usr/lib/libxc.so.$(MAJOR)
73	ln -sf libxc.so.$(MAJOR) $(DESTDIR)/usr/lib/libxc.so	76	ln -sf libxc.so.$(MAJOR) $(XENDESTDIR)/usr/lib/libxc.so
74	$(INSTALL_DATA) xc.h $(DESTDIR)/usr/include	77	$(INSTALL_DATA) xc.h $(XENDESTDIR)/usr/include
75		78
76	clean:	79	clean:
77	rm -rf .a .so .o .rpm $(LIB) *~ $(DEPS) xen	80	rm -rf .a .so .o .rpm $(LIB) *~ $(DEPS) xen

Lines 1-3 Link Here

(-)xen-2.0/tools/libxutil/Makefile (-4 / +7 lines)
		1	# Default is to install to local 'dist' directory.
		2	XENDISTDIR ?= ../dist
		3	XENDESTDIR ?= $(XENDISTDIR)/install
1	XEN_ROOT = ../..	4	XEN_ROOT = ../..
2	INSTALL = install	5	INSTALL = install
3	INSTALL_DATA = $(INSTALL) -m0644	6	INSTALL_DATA = $(INSTALL) -m0644
Lines 63-72 Link Here
63	fi	66	fi
64		67
65	install: all	68	install: all
66	[ -d $(DESTDIR)/usr/lib ] \|\| $(INSTALL_DIR) -p $(DESTDIR)/usr/lib	69	[ -d $(XENDESTDIR)/usr/lib ] \|\| $(INSTALL_DIR) -p $(XENDESTDIR)/usr/lib
67	$(INSTALL_PROG) $(LIB_NAME).so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib	70	$(INSTALL_PROG) $(LIB_NAME).so.$(MAJOR).$(MINOR) $(XENDESTDIR)/usr/lib
68	ln -sf $(LIB_NAME).so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib/$(LIB_NAME).so.$(MAJOR)	71	ln -sf $(LIB_NAME).so.$(MAJOR).$(MINOR) $(XENDESTDIR)/usr/lib/$(LIB_NAME).so.$(MAJOR)
69	ln -sf $(LIB_NAME).so.$(MAJOR) $(DESTDIR)/usr/lib/$(LIB_NAME).so	72	ln -sf $(LIB_NAME).so.$(MAJOR) $(XENDESTDIR)/usr/lib/$(LIB_NAME).so
70		73
71	clean:	74	clean:
72	$(RM) .a .so .so. .o .rpm	75	$(RM) .a .so .so. .o .rpm

Lines 1-3 Link Here

(-)xen-2.0/tools/misc/Makefile (-4 / +7 lines)
		1	# Default is to install to local 'dist' directory.
		2	XENDISTDIR ?= ../dist
		3	XENDESTDIR ?= $(XENDISTDIR)/install
1	INSTALL = install	4	INSTALL = install
2	INSTALL_PROG = $(INSTALL) -m0755	5	INSTALL_PROG = $(INSTALL) -m0755
3	INSTALL_DIR = $(INSTALL) -d -m0755	6	INSTALL_DIR = $(INSTALL) -d -m0755
Lines 23-32 Link Here
23	$(MAKE) -C miniterm	26	$(MAKE) -C miniterm
24		27
25	install: all	28	install: all
26	[ -d $(DESTDIR)/usr/bin ] \|\| $(INSTALL_DIR) $(DESTDIR)/usr/bin	29	[ -d $(XENDESTDIR)/usr/bin ] \|\| $(INSTALL_DIR) $(XENDESTDIR)/usr/bin
27	[ -d $(DESTDIR)/usr/sbin ] \|\| $(INSTALL_DIR) $(DESTDIR)/usr/sbin	30	[ -d $(XENDESTDIR)/usr/sbin ] \|\| $(INSTALL_DIR) $(XENDESTDIR)/usr/sbin
28	$(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)/usr/bin	31	$(INSTALL_PROG) $(INSTALL_BIN) $(XENDESTDIR)/usr/bin
29	$(INSTALL_PROG) $(INSTALL_SBIN) $(DESTDIR)/usr/sbin	32	$(INSTALL_PROG) $(INSTALL_SBIN) $(XENDESTDIR)/usr/sbin
30	# No sense in installing miniterm on the Xen box.	33	# No sense in installing miniterm on the Xen box.
31	# $(MAKE) -C miniterm install	34	# $(MAKE) -C miniterm install
32		35

Lines 1-3 Link Here

(-)xen-2.0/tools/sv/Makefile (-8 / +11 lines)
		1	# Default is to install to local 'dist' directory.
		2	XENDISTDIR ?= ../../dist
		3	XENDESTDIR ?= $(XENDISTDIR)/install
1	sv_insdir := /var/lib/xen/sv	4	sv_insdir := /var/lib/xen/sv
2	INSTALL = install	5	INSTALL = install
3	INSTALL_DIR = $(INSTALL) -d -m0755	6	INSTALL_DIR = $(INSTALL) -d -m0755
Lines 17-34 Link Here
17		20
18	install:	21	install:
19	# copy XenSV Main.rpy file	22	# copy XenSV Main.rpy file
20	@[ -d $(DESTDIR)$(sv_insdir) ] \|\| $(INSTALL_DIR) $(DESTDIR)$(sv_insdir)	23	@[ -d $(XENDESTDIR)$(sv_insdir) ] \|\| $(INSTALL_DIR) $(XENDESTDIR)$(sv_insdir)
21	@$(INSTALL_DATA) Main.rpy $(DESTDIR)$(sv_insdir)	24	@$(INSTALL_DATA) Main.rpy $(XENDESTDIR)$(sv_insdir)
22		25
23	# copy XenSV images	26	# copy XenSV images
24	@[ -d $(DESTDIR)$(sv_insdir)/images ] \|\| \	27	@[ -d $(XENDESTDIR)$(sv_insdir)/images ] \|\| \
25	$(INSTALL_DIR) $(DESTDIR)$(sv_insdir)/images	28	$(INSTALL_DIR) $(XENDESTDIR)$(sv_insdir)/images
26	@(cd images && $(INSTALL_DATA) $(IMAGES) $(DESTDIR)$(sv_insdir)/images)	29	# @(cd images && $(INSTALL_DATA) $(IMAGES) $(XENDESTDIR)$(sv_insdir)/images)
27		30
28	# copy XenSV stylesheet	31	# copy XenSV stylesheet
29	@[ -d $(DESTDIR)$(sv_insdir)/inc ] \|\| \	32	@[ -d $(XENDESTDIR)$(sv_insdir)/inc ] \|\| \
30	$(INSTALL_DIR) $(DESTDIR)$(sv_insdir)/inc	33	$(INSTALL_DIR) $(XENDESTDIR)$(sv_insdir)/inc
31	@$(INSTALL_DATA) inc/style.css inc/script.js $(DESTDIR)$(sv_insdir)/inc	34	@$(INSTALL_DATA) inc/style.css inc/script.js $(XENDESTDIR)$(sv_insdir)/inc
32		35
33	clean:	36	clean:
34		37

Lines 1-3 Link Here

(-)xen-2.0/tools/xentrace/Makefile (-8 / +11 lines)
		1	# Default is to install to local 'dist' directory.
		2	XENDISTDIR ?= ../dist
		3	XENDESTDIR ?= $(XENDISTDIR)/install
1	INSTALL = install	4	INSTALL = install
2	INSTALL_PROG = $(INSTALL) -m0755	5	INSTALL_PROG = $(INSTALL) -m0755
3	INSTALL_DIR = $(INSTALL) -d -m0755	6	INSTALL_DIR = $(INSTALL) -d -m0755
Lines 24-37 Link Here
24	all: $(BIN)	27	all: $(BIN)
25		28
26	install: all	29	install: all
27	[ -d $(DESTDIR)/usr/bin ] \|\| $(INSTALL_DIR) $(DESTDIR)/usr/bin	30	[ -d $(XENDESTDIR)/usr/bin ] \|\| $(INSTALL_DIR) $(XENDESTDIR)/usr/bin
28	[ -d $(DESTDIR)/usr/man/man1 ] \|\| \	31	[ -d $(XENDESTDIR)/usr/man/man1 ] \|\| \
29	$(INSTALL_DIR) $(DESTDIR)/usr/man/man1	32	$(INSTALL_DIR) $(XENDESTDIR)/usr/man/man1
30	[ -d $(DESTDIR)/usr/man/man8 ] \|\| \	33	[ -d $(XENDESTDIR)/usr/man/man8 ] \|\| \
31	$(INSTALL_DIR) $(DESTDIR)/usr/man/man8	34	$(INSTALL_DIR) $(XENDESTDIR)/usr/man/man8
32	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin	35	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(XENDESTDIR)/usr/bin
33	$(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/man/man1	36	$(INSTALL_DATA) $(MAN1) $(XENDESTDIR)/usr/man/man1
34	$(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/man/man8	37	$(INSTALL_DATA) $(MAN8) $(XENDESTDIR)/usr/man/man8
35		38
36	clean:	39	clean:
37	$(RM) .a .so .o .rpm $(BIN)	40	$(RM) .a .so .o .rpm $(BIN)

Lines 1-6 Link Here

(-)xen-2.0/xen/Makefile (-10 / +10 lines)
1	# Default is to install to local 'dist' directory.	1	# Default is to install to local 'dist' directory.
2	DISTDIR ?= ../dist	2	XENDISTDIR ?= ../dist
3	DESTDIR ?= $(DISTDIR)/install	3	XENDESTDIR ?= $(XENDISTDIR)/install
4		4
5	INSTALL = install	5	INSTALL = install
6	INSTALL_DATA = $(INSTALL) -m0644	6	INSTALL_DATA = $(INSTALL) -m0644
Lines 28-41 Link Here
28	$(MAKE) install	28	$(MAKE) install
29		29
30	install: $(TARGET).gz	30	install: $(TARGET).gz
31	[ -d $(DESTDIR)/boot ] \|\| $(INSTALL_DIR) $(DESTDIR)/boot	31	[ -d $(XENDESTDIR)/boot ] \|\| $(INSTALL_DIR) $(XENDESTDIR)/boot
32	$(INSTALL_DATA) $(TARGET).gz $(DESTDIR)/boot	32	$(INSTALL_DATA) $(TARGET).gz $(XENDESTDIR)/boot
33	$(INSTALL_DATA) $(TARGET)-syms $(DESTDIR)/boot	33	$(INSTALL_DATA) $(TARGET)-syms $(XENDESTDIR)/boot
34	[ -d $(DESTDIR)/usr/include/xen/io ] \|\| \	34	[ -d $(XENDESTDIR)/usr/include/xen/io ] \|\| \
35	$(INSTALL_DIR) $(DESTDIR)/usr/include/xen/io	35	$(INSTALL_DIR) $(XENDESTDIR)/usr/include/xen/io
36	$(INSTALL_DATA) include/public/*.h $(DESTDIR)/usr/include/xen	36	$(INSTALL_DATA) include/public/*.h $(XENDESTDIR)/usr/include/xen
37	$(INSTALL_DATA) include/public/io/*.h $(DESTDIR)/usr/include/xen/io	37	$(INSTALL_DATA) include/public/io/*.h $(XENDESTDIR)/usr/include/xen/io
38	$(INSTALL_DATA) include/public/COPYING $(DESTDIR)/usr/include/xen	38	$(INSTALL_DATA) include/public/COPYING $(XENDESTDIR)/usr/include/xen
39		39
40	clean:	40	clean:
41	$(MAKE) -C tools clean	41	$(MAKE) -C tools clean