[Pkg-xen-changes] r959 - in trunk/xen/debian: . scripts

[Bastian Blank]

Author: waldi
Date: Tue Jan 31 14:06:28 2012
New Revision: 959

Log:
* debian/rules.real: Fix installation.
* debian/scripts: Add.
* debian/xen-utils-common.install: Re-add entries.

Added:
   trunk/xen/debian/scripts/
      - copied from r958, trunk/xen-common/debian/scripts/
Modified:
   trunk/xen/debian/rules.real
   trunk/xen/debian/xen-utils-common.install

Modified: trunk/xen/debian/rules.real
==============================================================================
--- trunk/xen/debian/rules.real	Tue Jan 31 13:52:26 2012	(r958)
+++ trunk/xen/debian/rules.real	Tue Jan 31 14:06:28 2012	(r959)
@@ -94,6 +94,17 @@
 	strip --remove-section=.comment --remove-section=.note $(INSTALL_DIR)/usr/lib/xen*/boot/*
 	touch $@
 
+$(STAMPS_DIR)/install-utils-common: DIR = $(BUILD_DIR)/build-docs
+$(STAMPS_DIR)/install-utils-common: INSTALL_DIR = $(BUILD_DIR)/install-utils-common
+$(STAMPS_DIR)/install-utils-common: export DESTDIR = $(CURDIR)/$(INSTALL_DIR)
+$(STAMPS_DIR)/install-utils-common: $(STAMPS_DIR)/build-docs
+	@rm -rf $(INSTALL_DIR)
+	+$(MAKE_CLEAN) -C $(SOURCE_DIR)/tools/examples install-configs
+	+$(MAKE_CLEAN) -C $(SOURCE_DIR)/tools/hotplug/common install-scripts
+	+$(MAKE_CLEAN) -C $(SOURCE_DIR)/tools/hotplug/Linux install-udev install-scripts UDEV_RULES_DIR=/lib/udev
+	+$(MAKE_CLEAN) -C debian/scripts install
+	touch $@
+
 install-base:
 	dh_installchangelogs -XChangelog
 	dh_installdocs
@@ -219,16 +230,13 @@
 install-utils-common: DIR = $(BUILD_DIR)/install-utils-common
 install-utils-common: PACKAGE_NAME = xen-utils-common
 install-utils-common: DH_OPTIONS = -p$(PACKAGE_NAME)
-install-utils-common: export DESTDIR = $(CURDIR)/$(DIR)
-install-utils-common: $(STAMPS_DIR)/build-docs
+install-utils-common: $(STAMPS_DIR)/install-utils-common
 	dh_testdir
 	dh_testroot
 	dh_prep
-	$(MAKE) -C $(SOURCE_DIR)/tools/examples install-configs
-	$(MAKE) -C $(SOURCE_DIR)/tools/hotplug/common install-scripts
-	$(MAKE) -C $(SOURCE_DIR)/tools/hotplug/Linux install-udev install-scripts UDEV_RULES_DIR=/lib/udev
 	dh_install --sourcedir=$(DIR)
 	dh_installman $(SOURCE_DIR)/docs/man1/* $(SOURCE_DIR)/docs/man5/*
+	dh_link
 	+$(MAKE_SELF) install-base
 
 install-xenstore-utils_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH)

Modified: trunk/xen/debian/xen-utils-common.install
==============================================================================
--- trunk/xen/debian/xen-utils-common.install	Tue Jan 31 13:52:26 2012	(r958)
+++ trunk/xen/debian/xen-utils-common.install	Tue Jan 31 14:06:28 2012	(r959)
@@ -2,5 +2,5 @@
 etc/xen/xl*
 etc/xen/xend*
 lib/udev/rules.d/*.rules
-#usr/lib/xen-common
-#usr/sbin
+usr/lib/xen-common
+usr/sbin