[Pkg-xen-changes] r219 - trunk/xen-3.0/debian

[Bastian Blank]

Author: waldi
Date: Fri Aug 18 14:52:14 2006
New Revision: 219

Added:
   trunk/xen-3.0/debian/rules.defs
Modified:
   trunk/xen-3.0/debian/rules

Log:
* debian/rules
  - Use debian/rules.defs.
  - Provide correct architecture to tools build.
* debian/rules.defs: Add.


Modified: trunk/xen-3.0/debian/rules
==============================================================================
--- trunk/xen-3.0/debian/rules	(original)
+++ trunk/xen-3.0/debian/rules	Fri Aug 18 14:52:14 2006
@@ -7,9 +7,9 @@
 DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 srcver   := $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
 VERSION  := $(shell echo $(srcver) | sed -e 's,-[^-]*$$,,')
-MAJOR    := 3.0
 BUILD_DIR = debian/build
 STAMPS_DIR = debian/stamps
+include debian/rules.defs
 
 export DH_OPTIONS
 
@@ -66,8 +66,14 @@
 	$(MAKE) -C $(DIR)/xen XEN_TARGET_ARCH=x86_32 XEN_TARGET_X86_PAE=y 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
+	$(MAKE) -C $(DIR)/tools XEN_TARGET_ARCH=$(XEN_TARGET_ARCH)
 	touch $@
 
 setup-docs:: $(STAMPS_DIR)/setup-docs

Added: trunk/xen-3.0/debian/rules.defs
==============================================================================
--- (empty file)
+++ trunk/xen-3.0/debian/rules.defs	Fri Aug 18 14:52:14 2006
@@ -0,0 +1 @@
+MAJOR    := 3.0