From 3d1d4c35fab8a2f2f90c8147cb72c4aee101f54c Mon Sep 17 00:00:00 2001 From: "chris@kneesaa.uk.xensource.com" Date: Sat, 8 Jul 2006 19:22:34 +0100 Subject: [BUILD] Fix re-use of existing config files in dist/install/boot. - the name of the config file was computed incorrectly because of the linux version number 4th digit being present in both LINUX_VER and EXTRAVERSION extracted from the linux Makefile. - DESTDIR was not set for the prep and config targets. Signed-off-by: Christian Limpach --- buildconfigs/Rules.mk | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'buildconfigs/Rules.mk') diff --git a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk index 5e7d659a5b..0a508b782b 100644 --- a/buildconfigs/Rules.mk +++ b/buildconfigs/Rules.mk @@ -69,9 +69,6 @@ ref-%/.valid-ref: pristine-%/.valid-pristine touch $@ # update timestamp to avoid rebuild endif -%-prep: - $(MAKE) -f buildconfigs/mk.$* prep - %-install: $(MAKE) -f buildconfigs/mk.$* build @@ -83,15 +80,20 @@ endif %-build: %-dist @: # do nothing +%-prep: DESTDIR=$(DISTDIR)/install +%-prep: + $(MAKE) -f buildconfigs/mk.$* prep + +%-config: DESTDIR=$(DISTDIR)/install +%-config: + $(MAKE) -f buildconfigs/mk.$* config + %-delete: $(MAKE) -f buildconfigs/mk.$* delete %-clean: $(MAKE) -f buildconfigs/mk.$* clean -%-config: - $(MAKE) -f buildconfigs/mk.$* config - linux-2.6-xen.patch: ref-linux-$(LINUX_VER)/.valid-ref rm -rf tmp-$@ cp -al $(