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

[Bastian Blank]

Author: waldi
Date: Sun Aug 20 22:40:07 2006
New Revision: 235

Modified:
   trunk/xen-3.0/debian/rules.real

Log:
debian/rules.real: Update.


Modified: trunk/xen-3.0/debian/rules.real
==============================================================================
--- trunk/xen-3.0/debian/rules.real	(original)
+++ trunk/xen-3.0/debian/rules.real	Sun Aug 20 22:40:07 2006
@@ -54,7 +54,7 @@
 
 $(STAMPS_DIR)/build-utils_$(ARCH): DIR=$(BUILD_DIR)/build-utils_$(ARCH)
 $(STAMPS_DIR)/build-utils_$(ARCH): $(STAMPS_DIR)/setup-utils_$(ARCH)
-	$(MAKE) -C $(DIR)/tools XEN_COMPILE_ARCH=$(XEN_ARCH) XEN_TARGET_ARCH=$(XEN_ARCH)
+	$(MAKE) -C $(DIR)/tools XEN_COMPILE_ARCH=$(XEN_ARCH) XEN_TARGET_ARCH=$(XEN_ARCH) XEN_VERSION=$(VERSION)$(ABINAME) XEN_VERSION_IOEMU=$(MAJOR)
 	touch $@
 
 install-base:
@@ -101,7 +101,7 @@
 	install -D -m644 debian/xen-utils.README.Debian debian/$(PACKAGE_NAME_UTILS)/usr/share/doc/$(PACKAGE_NAME_UTILS)/README.Debian
 	# TODO: move to xen-common
 	install -D debian/scripts/network-dummy debian/$(PACKAGE_NAME_UTILS)/etc/xen/scripts/network-dummy
-	$(MAKE) -C $(DIR)/tools install XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=$(CURDIR)/debian/tmp DISTDIR=$(CURDIR)/debian/tmp XEN_COMPILE_ARCH=$(XEN_ARCH) XEN_TARGET_ARCH=$(XEN_ARCH)
+	$(MAKE) -C $(DIR)/tools install DESTDIR=$(CURDIR)/debian/tmp DISTDIR=$(CURDIR)/debian/tmp XEN_COMPILE_ARCH=$(XEN_ARCH) XEN_TARGET_ARCH=$(XEN_ARCH) XEN_VERSION=$(VERSION)$(ABINAME) XEN_VERSION_IOEMU=$(MAJOR)
 	# TODO: move to xen-common
 	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_UTILS) --sourcedir=debian/tmp etc/udev/*.rules etc/udev
 	# TODO: move to xen-common
@@ -110,27 +110,12 @@
 etc/xen/scripts \
 etc/xen/xend* \
 etc/xen
-	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_UTILS) --sourcedir=debian/tmp usr/bin/xenstore* usr/bin
-	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_UTILS) --sourcedir=debian/tmp usr/lib/python* usr/lib
-	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_UTILS) --sourcedir=debian/tmp \
-usr/lib/xen/bin/xc* \
-usr/lib/xen/bin/xen* \
-usr/lib/xen/bin
-	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_UTILS) --sourcedir=debian/tmp \
-usr/lib/xen/*.so \
-usr/lib/xen
-	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_UTILS) --sourcedir=debian/tmp \
-usr/sbin/xenconsoled \
-usr/sbin/xend \
-usr/sbin/xenstored \
-usr/sbin/xentop \
-usr/sbin/xm \
-usr/sbin
+	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_UTILS) --sourcedir=debian/tmp usr/in/xenstore* usr/bin
+	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_UTILS) --sourcedir=debian/tmp usr/lib/xen-$(VERSION)$(ABINAME) usr/lib
 	# TODO: move to xen-common and /etc/xen/scripts
 	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_IOEMU) --sourcedir=debian/tmp etc/xen/qemu-ifup etc/xen
-	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_IOEMU) --sourcedir=debian/tmp usr/lib/xen/bin/qemu-dm usr/lib/xen/bin
-	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_IOEMU) --sourcedir=debian/tmp usr/lib/xen/boot usr/lib/xen
-	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_IOEMU) --sourcedir=debian/tmp usr/share/xen/qemu usr/share/xen
+	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_IOEMU) --sourcedir=debian/tmp usr/lib/xen-ioemu-$(MAJOR) usr/lib
+	DH_OPTIONS= dh_install -p$(PACKAGE_NAME_IOEMU) --sourcedir=debian/tmp usr/share/xen-ioemu-$(MAJOR) usr/share
 	dh_pycentral
 	dh_python
 	$(MAKE) -f debian/rules.real install-base