[Pkg-xen-changes] r921 - trunk/xen-common/debian/scripts

[Bastian Blank]

Author: waldi
Date: Wed Oct 26 20:25:12 2011
New Revision: 921

Log:
debian/scripts/Makefile: Cleanup install.

Modified:
   trunk/xen-common/debian/scripts/Makefile

Modified: trunk/xen-common/debian/scripts/Makefile
==============================================================================
--- trunk/xen-common/debian/scripts/Makefile	Wed Oct 26 19:35:18 2011	(r920)
+++ trunk/xen-common/debian/scripts/Makefile	Wed Oct 26 20:25:12 2011	(r921)
@@ -1,7 +1,13 @@
 ETC_SCRIPTS = \
 	qemu-ifup
 
-GLOBAL_WRAPPER_SCRIPTS = \
+GLOBAL_TOOLSTACK_LINKS = \
+	xl \
+	xm
+
+GLOBAL_TOOLSTACK_WRAPPER = xen-utils-wrapper
+
+GLOBAL_UTILS_LINKS = \
 	cpuperf-perfcntr \
 	cpuperf-xen \
 	xend \
@@ -11,15 +17,13 @@
 	xentrace \
 	xentrace_format \
 	xentrace_setmask \
-	xentrace_setsize \
-	xl \
-	xm
+	xentrace_setsize
+
+GLOBAL_UTILS_WRAPPER = xen-utils-wrapper
 
 PRIVATE_SCRIPTS = \
 	xen-version \
-	$(WRAPPER)
-
-WRAPPER = xen-utils-wrapper
+	$(GLOBAL_UTILS_WRAPPER)
 
 ETC_SCRIPTS_DIR = /etc/xen/scripts
 GLOBAL_SCRIPTS_DIR = /usr/sbin
@@ -29,9 +33,13 @@
 	install -d $(DESTDIR)$(ETC_SCRIPTS_DIR)
 	install $(ETC_SCRIPTS) $(DESTDIR)$(ETC_SCRIPTS_DIR)
 	install -d $(DESTDIR)$(GLOBAL_SCRIPTS_DIR)
-	@for i in $(GLOBAL_WRAPPER_SCRIPTS); do \
-	    echo ln -s $(PRIVATE_SCRIPTS_DIR)/$(WRAPPER) $(DESTDIR)$(GLOBAL_SCRIPTS_DIR)/$$i; \
-	    ln -s $(PRIVATE_SCRIPTS_DIR)/$(WRAPPER) $(DESTDIR)$(GLOBAL_SCRIPTS_DIR)/$$i || exit 1; \
+	@for i in $(GLOBAL_TOOLSTACK_LINKS); do \
+	    echo ln -s $(PRIVATE_SCRIPTS_DIR)/$(GLOBAL_TOOLSTACK_WRAPPER) $(DESTDIR)$(GLOBAL_SCRIPTS_DIR)/$$i; \
+	    ln -s $(PRIVATE_SCRIPTS_DIR)/$(GLOBAL_TOOLSTACK_WRAPPER) $(DESTDIR)$(GLOBAL_SCRIPTS_DIR)/$$i || exit 1; \
+        done
+	@for i in $(GLOBAL_UTILS_LINKS); do \
+	    echo ln -s $(PRIVATE_SCRIPTS_DIR)/$(GLOBAL_UTILS_WRAPPER) $(DESTDIR)$(GLOBAL_SCRIPTS_DIR)/$$i; \
+	    ln -s $(PRIVATE_SCRIPTS_DIR)/$(GLOBAL_UTILS_WRAPPER) $(DESTDIR)$(GLOBAL_SCRIPTS_DIR)/$$i || exit 1; \
 	done
 	install -d $(DESTDIR)$(PRIVATE_SCRIPTS_DIR)
 	install $(PRIVATE_SCRIPTS) $(DESTDIR)$(PRIVATE_SCRIPTS_DIR)