Author: waldi Date: Fri Aug 18 16:33:23 2006 New Revision: 225 Modified: trunk/xen-unstable/debian/rules Log: debian/rules: Always provide XEN_TARGET_ARCH. Modified: trunk/xen-unstable/debian/rules =============================================================================--- trunk/xen-unstable/debian/rules (original) +++ trunk/xen-unstable/debian/rules Fri Aug 18 16:33:23 2006 @@ -66,12 +66,6 @@ $(MAKE) -C $(DIR)/xen XEN_TARGET_ARCH=x86_32 XEN_TARGET_X86_PAE=y touch $@ -ifneq (,$(filter amd64, $(DEB_HOST_ARCH))) -$(STAMPS_DIR)/build-tools: XEN_TARGET_ARCH=x86_64 -endif -ifneq (,$(filter i386, $(DEB_HOST_ARCH))) -$(STAMPS_DIR)/build-tools: XEN_TARGET_ARCH=x86_32 -endif $(STAMPS_DIR)/build-tools: $(STAMPS_DIR)/setup-tools $(MAKE) -C $(DIR)/tools XEN_TARGET_ARCH=$(XEN_TARGET_ARCH) touch $@ @@ -92,6 +86,12 @@ setup-hypervisor:: $(STAMPS_DIR)/setup-hypervisor-i386-pae endif ifneq (,$(filter amd64 i386 ia64, $(DEB_HOST_ARCH))) +ifneq (,$(filter amd64, $(DEB_HOST_ARCH))) +build-tools install-tools-check: XEN_TARGET_ARCH=x86_64 +endif +ifneq (,$(filter i386, $(DEB_HOST_ARCH))) +build-tools install-tools-check: XEN_TARGET_ARCH=x86_32 +endif build-tools:: $(STAMPS_DIR)/build-tools install-tools-check:: install-tools setup-tools:: $(STAMPS_DIR)/setup-tools @@ -152,7 +152,7 @@ dh_clean -k $(MAKE) -C $(BUILD_DIR)/build-docs/docs install DESTDIR=$(CURDIR)/debian/tmp - $(MAKE) -C $(BUILD_DIR)/build-tools/tools install XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=$(CURDIR)/debian/tmp DISTDIR=$(CURDIR)/debian/tmp + $(MAKE) -C $(BUILD_DIR)/build-tools/tools install XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=$(CURDIR)/debian/tmp DISTDIR=$(CURDIR)/debian/tmp XEN_TARGET_ARCH=$(XEN_TARGET_ARCH) cp debian/scripts/network-dummy $(CURDIR)/debian/tmp/etc/xen/scripts dh_install --sourcedir=debian/tmp