new calling convention for install_* macros. see commit 4759 to Rules.make

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.10-trunk@4760 33e552b5-05e3-0310-8538-816dae2090ed
author: Sascha Hauer <s.hauer@pengutronix.de> 2006-02-24 17:34:58 +0000
committer: Sascha Hauer <s.hauer@pengutronix.de> 2006-02-24 17:34:58 +0000
commit: d008f7b7bc5a55dfb86ae421903af76ee901c530 (patch)
tree: 4b2679948d102974dd560134acfd1b7012626f6a /rules
parent: 19780c394ec957f9cd4b46ca2fb35c004d647bda (diff)
download: ptxdist-d008f7b7bc5a55dfb86ae421903af76ee901c530.tar.gz
ptxdist-d008f7b7bc5a55dfb86ae421903af76ee901c530.tar.xz
295 files changed, 4008 insertions, 4003 deletions
diff --git a/rules/Toplevel.make b/rules/Toplevel.make
index 852e171bc..884132400 100644
--- a/rules/Toplevel.make
+++ b/rules/Toplevel.make
@@ -98,6 +98,8 @@ all:
 include $(RULESDIR)/Rules.make
 include $(RULESDIR)/Version.make
 
+PROJECTRULES := $(wildcard $(PROJECTRULESDIR)/*.make)
+
 TMP_PROJECTRULES_IN = $(filter-out 			\
 		$(RULESDIR)/Virtual.make 		\
 		$(RULESDIR)/Rules.make 			\
@@ -266,6 +268,7 @@ images_deps += $(STATEDIR)/ipkg-push
 endif
 
 $(STATEDIR)/images: $(images_deps)
+	cat $(STATEDIR)/*.perms > $(IMAGEDIR)/permissions
 ifdef PTXCONF_IMAGE_TGZ
 	cd $(ROOTDIR); \
 	($(AWK) -F: $(DOPERMISSIONS) $(IMAGEDIR)/permissions && \
@@ -543,7 +546,7 @@ rootclean: imagesclean
 	@rm -f $(STATEDIR)/*.targetinstall
 	@echo "done."	
 	@echo -n "cleaning permissions............. "
-	@rm -f $(IMAGEDIR)/permissions
+	@rm -f $(STATEDIR)/*.perms
 	@echo "done."
 	@echo
 
diff --git a/rules/apache.make b/rules/apache.make
index c3c9fe6ee..5ece74e49 100644
--- a/rules/apache.make
+++ b/rules/apache.make
@@ -126,19 +126,19 @@ apache_targetinstall: $(STATEDIR)/apache.targetinstall
 $(STATEDIR)/apache.targetinstall: $(apache_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,apache)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(APACHE_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Jiri Nesladek <nesladek\@2n.cz>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, /usr/lib/apache)
-	@$(call install_copy, 0, 0, 0755, $(APACHE_DIR)/src/httpd, /usr/sbin/httpd)
-
-	@$(call install_finish)
+	@$(call install_init, apache)
+	@$(call install_fixup, apache,PACKAGE,apache)
+	@$(call install_fixup, apache,PRIORITY,optional)
+	@$(call install_fixup, apache,VERSION,$(APACHE_VERSION))
+	@$(call install_fixup, apache,SECTION,base)
+	@$(call install_fixup, apache,AUTHOR,"Jiri Nesladek <nesladek\@2n.cz>")
+	@$(call install_fixup, apache,DEPENDS,)
+	@$(call install_fixup, apache,DESCRIPTION,missing)
+
+	@$(call install_copy, apache, 0, 0, 0755, /usr/lib/apache)
+	@$(call install_copy, apache, 0, 0, 0755, $(APACHE_DIR)/src/httpd, /usr/sbin/httpd)
+
+	@$(call install_finish, apache)
 
 	@$(call touch, $@)
 
diff --git a/rules/apache2.make b/rules/apache2.make
index 83feabd4b..fdc9e9a75 100644
--- a/rules/apache2.make
+++ b/rules/apache2.make
@@ -142,64 +142,64 @@ apache2_targetinstall: $(STATEDIR)/apache2.targetinstall
 $(STATEDIR)/apache2.targetinstall: $(apache2_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,apache2)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(APACHE2_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, apache2)
+	@$(call install_fixup, apache2,PACKAGE,apache2)
+	@$(call install_fixup, apache2,PRIORITY,optional)
+	@$(call install_fixup, apache2,VERSION,$(APACHE2_VERSION))
+	@$(call install_fixup, apache2,SECTION,base)
+	@$(call install_fixup, apache2,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, apache2,DEPENDS,)
+	@$(call install_fixup, apache2,DESCRIPTION,missing)
 
 	# the server binary
-	@$(call install_copy, 0, 0, 0755, $(APACHE2_DIR)/.libs/httpd, /usr/sbin/apache2)
+	@$(call install_copy, apache2, 0, 0, 0755, $(APACHE2_DIR)/.libs/httpd, /usr/sbin/apache2)
 
 	# and some needed shared libraries
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, apache2, 0, 0, 0644, \
 		$(APACHE2_DIR)/srclib/apr-util/.libs/libaprutil-0.so.0.9.7, \
 		/usr/lib/libaprutil-0.so.0.9.7)
-	@$(call install_link, libaprutil-0.so.0.9.7, /usr/lib/libaprutil-0.so.0.9)
-	@$(call install_link, libaprutil-0.so.0.9.7, /usr/lib/libaprutil-0.so.0)
+	@$(call install_link, apache2, libaprutil-0.so.0.9.7, /usr/lib/libaprutil-0.so.0.9)
+	@$(call install_link, apache2, libaprutil-0.so.0.9.7, /usr/lib/libaprutil-0.so.0)
 
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, apache2, 0, 0, 0644, \
 		$(APACHE2_DIR)/srclib/apr/.libs/libapr-0.so.0.9.7, \
 		/usr/lib/libapr-0.so.0.9.7)
-	@$(call install_link, libapr-0.so.0.9.7, /usr/lib/libapr-0.so.0.9)
-	@$(call install_link, libapr-0.so.0.9.7, /usr/lib/libapr-0.so.0)
+	@$(call install_link, apache2, libapr-0.so.0.9.7, /usr/lib/libapr-0.so.0.9)
+	@$(call install_link, apache2, libapr-0.so.0.9.7, /usr/lib/libapr-0.so.0)
 
 ifneq ($(PTXCONF_APACHE2_SERVERROOT),"")
-	@$(call install_copy, 12,102,0755,$(PTXCONF_APACHE2_SERVERROOT))
+	@$(call install_copy, apache2, 12,102,0755,$(PTXCONF_APACHE2_SERVERROOT))
 
 	# TODO: are the icons needed? (or are all icons required?)
 
-	@$(call install_copy, 12,102,0755,$(PTXCONF_APACHE2_SERVERROOT)/icons)
+	@$(call install_copy, apache2, 12,102,0755,$(PTXCONF_APACHE2_SERVERROOT)/icons)
 	@cd $(APACHE2_DIR)/docs/icons; \
 	for i in *.gif *.png; do \
-		$(call install_copy, 12,102,0644,$$i,$(PTXCONF_APACHE2_SERVERROOT)/icons/$$i,n); \
+		$(call install_copy, apache2, 12,102,0644,$$i,$(PTXCONF_APACHE2_SERVERROOT)/icons/$$i,n); \
 	done
-	@$(call install_copy, 12,102,0755,$(PTXCONF_APACHE2_SERVERROOT)/icons/small)
+	@$(call install_copy, apache2, 12,102,0755,$(PTXCONF_APACHE2_SERVERROOT)/icons/small)
 	@cd $(APACHE2_DIR)/docs/icons/small; \
 	for i in *.gif *.png; do \
-		$(call install_copy, 12,102,0644,$$i,$(PTXCONF_APACHE2_SERVERROOT)/icons/small/$$i,n); \
+		$(call install_copy, apache2, 12,102,0644,$$i,$(PTXCONF_APACHE2_SERVERROOT)/icons/small/$$i,n); \
 	done
-	@$(call install_copy, 12, 102, 0644, \
+	@$(call install_copy, apache2, 12, 102, 0644, \
 		$(APACHE2_DIR)/docs/conf/mime.types, \
 		$(PTXCONF_APACHE2_SERVERROOT)/conf/mime.types,n)
 endif
 
 ifneq ($(PTXCONF_APACHE2_DOCUMENTROOT),"")
-	@$(call install_copy, 12, 102, 0755, $(PTXCONF_APACHE2_DOCUMENTROOT))
+	@$(call install_copy, apache2, 12, 102, 0755, $(PTXCONF_APACHE2_DOCUMENTROOT))
 ifdef PTXCONF_APACHE2_DEFAULT_INDEX
-	@$(call install_copy, 12, 102, 0644, \
+	@$(call install_copy, apache2, 12, 102, 0644, \
 		$(PTXDIST_TOPDIR)/projects/generic/index.html, \
 		$(PTXCONF_APACHE2_DOCUMENTROOT)/index.html,n)
 endif
 endif
 
 ifneq ($(PTXCONF_APACHE2_CONFIGDIR),"")
-	@$(call install_copy, 12, 102, 0755, $(PTXCONF_APACHE2_CONFIGDIR))
+	@$(call install_copy, apache2, 12, 102, 0755, $(PTXCONF_APACHE2_CONFIGDIR))
 
-	@$(call install_copy, 12, 102, 0644, \
+	@$(call install_copy, apache2, 12, 102, 0644, \
 		$(APACHE2_DIR)/docs/conf/magic, \
 		$(PTXCONF_APACHE2_CONFIGDIR)/magic,n)
 
@@ -217,13 +217,13 @@ ifdef PTXCONF_APACHE2_DEFAULTCONFIG
 	perl -i -p -e "s,\@SERVERNAME@,$(PTXCONF_APACHE2_SERVERNAME),g" $(APACHE2_DIR)/httpd.conf
 
 	@echo "installing default config file..."
-	@$(call install_copy, 12, 102, 0644, \
+	@$(call install_copy, apache2, 12, 102, 0644, \
 		$(APACHE2_DIR)/httpd.conf, \
 		$(PTXCONF_APACHE2_CONFIGDIR)/httpd.conf,n)
 else
 ifneq ($(PTXCONF_APACHE2_USERCONFIG), "")
 	@echo "installing user config file..."
-	@$(call install_copy, 12, 102, 0644, \
+	@$(call install_copy, apache2, 12, 102, 0644, \
 		$(PTXCONF_APACHE2_USERCONFIG), \
 		$(PTXCONF_APACHE2_CONFIGDIR)/httpd.conf,n)
 endif
@@ -231,22 +231,22 @@ endif
 endif
 
 ifneq ($(PTXCONF_APACHE2_LOGDIR),"")
-	@$(call install_copy, 12, 102, 0755, $(PTXCONF_APACHE2_LOGDIR))
+	@$(call install_copy, apache2, 12, 102, 0755, $(PTXCONF_APACHE2_LOGDIR))
 endif
 ifdef PTXCONF_ROOTFS_ETC_INITD_HTTPD
 ifneq ($(call remove_quotes,$(PTXCONF_ROOTFS_ETC_INITD_HTTPD_USER_FILE)),)
-	@$(call install_copy, 0, 0, 0755, $(PTXCONF_ROOTFS_ETC_INITD_HTTPD_USER_FILE), /etc/init.d/httpd, n)
+	@$(call install_copy, apache2, 0, 0, 0755, $(PTXCONF_ROOTFS_ETC_INITD_HTTPD_USER_FILE), /etc/init.d/httpd, n)
 else
 	@cp $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/httpd $(APACHE2_DIR)/init_httpd
 	@perl -i -p -e "s,\@APACHECONFIG@,$(call remove_quotes,$(PTXCONF_APACHE2_CONFIGDIR))/httpd.conf,g" $(APACHE2_DIR)/init_httpd
 	@perl -i -p -e "s,\@LOGPATH@,$(call remove_quotes,$(PTXCONF_APACHE2_LOGDIR))/httpd.conf,g" $(APACHE2_DIR)/init_httpd
-	@$(call install_copy, 0, 0, 0755, $(APACHE2_DIR)/init_httpd, /etc/init.d/httpd, n)
+	@$(call install_copy, apache2, 0, 0, 0755, $(APACHE2_DIR)/init_httpd, /etc/init.d/httpd, n)
 endif
 endif
 
 ifneq ($(PTXCONF_ROOTFS_ETC_INITD_HTTPD_LINK),"")
-	@$(call install_copy, 0, 0, 0755, /etc/rc.d)
-	@$(call install_link, ../init.d/httpd, /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_HTTPD_LINK))
+	@$(call install_copy, apache2, 0, 0, 0755, /etc/rc.d)
+	@$(call install_link, apache2, ../init.d/httpd, /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_HTTPD_LINK))
 endif
 
 # #
@@ -256,16 +256,16 @@ endif
 # ifdef ROOTFS_HTTPD_USER_DOC
 # 	@cd $(PTXCONF_ROOTFS_HTTPD_USER_DOC_PATH); \
 # 	for i in *.html *.gif *.png; do \
-# 		$(call install_copy, 12,102,0644,$$i,$(PTXCONF_ROOTFS_HTTPD_SERVERROOT)/docroot/$$i,n); \
+# 		$(call install_copy, apache2, 12,102,0644,$$i,$(PTXCONF_ROOTFS_HTTPD_SERVERROOT)/docroot/$$i,n); \
 # 	done
 # else
-# 	$(call install_copy, 12,102,0644,$(PTXDIST_TOPDIR)/projetcs/generic/index.html,$(PTXCONF_ROOTFS_HTTPD_SERVERROOT)/docroot/index.html,n)
+# 	$(call install_copy, apache2, 12,102,0644,$(PTXDIST_TOPDIR)/projetcs/generic/index.html,$(PTXCONF_ROOTFS_HTTPD_SERVERROOT)/docroot/index.html,n)
 # endif
-# 	@$(call install_copy, 12,102,0755,$(PTXCONF_ROOTFS_HTTPD_SERVERROOT)/cgi-bin)
-# 	@$(call install_copy, 12,102,0644,$(APACHE2_DIR)/doc/cgi-examples/test-cgi,$(PTXCONF_ROOTFS_HTTPD_SERVERROOT)/cgi-bin,n)
-# 	@$(call install_copy, 12,102,0755,$(PTXCONF_ROOTFS_HTTPD_SERVERROOT)/log)
+# 	@$(call install_copy, apache2, 12,102,0755,$(PTXCONF_ROOTFS_HTTPD_SERVERROOT)/cgi-bin)
+# 	@$(call install_copy, apache2, 12,102,0644,$(APACHE2_DIR)/doc/cgi-examples/test-cgi,$(PTXCONF_ROOTFS_HTTPD_SERVERROOT)/cgi-bin,n)
+# 	@$(call install_copy, apache2, 12,102,0755,$(PTXCONF_ROOTFS_HTTPD_SERVERROOT)/log)
 
-	@$(call install_finish)
+	@$(call install_finish, apache2)
 
 	@$(call touch, $@)
 
diff --git a/rules/atk124.make b/rules/atk124.make
index 52cbba13d..19dc101b6 100644
--- a/rules/atk124.make
+++ b/rules/atk124.make
@@ -108,22 +108,22 @@ atk_targetinstall: $(STATEDIR)/atk.targetinstall
 $(STATEDIR)/atk.targetinstall: $(atk_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,atk)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(ATK_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_init, atk)
+	@$(call install_fixup, atk,PACKAGE,atk)
+	@$(call install_fixup, atk,PRIORITY,optional)
+	@$(call install_fixup, atk,VERSION,$(ATK_VERSION))
+	@$(call install_fixup, atk,SECTION,base)
+	@$(call install_fixup, atk,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, atk,DEPENDS,)
+	@$(call install_fixup, atk,DESCRIPTION,missing)
+
+	@$(call install_copy, atk, 0, 0, 0644, \
 		$(ATK_DIR)/atk/.libs/libatk-1.0.so.0.$(ATK_LIB_VERSION), \
 		/usr/lib/libatk-1.0.so.o.$(ATK_LIB_VERSION))
-	@$(call install_link, libatk-1.0.so.0.$(ATK_LIB_VERSION), /usr/lib/libatk-1.0.so.0)
-	@$(call install_link, libatk-1.0.so.0.$(ATK_LIB_VERSION), /usr/lib/libatk-1.0.so)
+	@$(call install_link, atk, libatk-1.0.so.0.$(ATK_LIB_VERSION), /usr/lib/libatk-1.0.so.0)
+	@$(call install_link, atk, libatk-1.0.so.0.$(ATK_LIB_VERSION), /usr/lib/libatk-1.0.so)
 
-	@$(call install_finish)
+	@$(call install_finish, atk)
 
 	@$(call touch, $@)
 
diff --git a/rules/bash.make b/rules/bash.make
index 513d2dcfb..e761ae252 100644
--- a/rules/bash.make
+++ b/rules/bash.make
@@ -224,19 +224,19 @@ bash_targetinstall: $(STATEDIR)/bash.targetinstall
 $(STATEDIR)/bash.targetinstall: $(bash_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,BASH)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(BASH_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(BASH_DIR)/bash, /bin/bash)
-	@$(call install_link, bash, /bin/sh)
-
-	@$(call install_finish)
+	@$(call install_init, bash)
+	@$(call install_fixup, bash,PACKAGE,BASH)
+	@$(call install_fixup, bash,PRIORITY,optional)
+	@$(call install_fixup, bash,VERSION,$(BASH_VERSION))
+	@$(call install_fixup, bash,SECTION,base)
+	@$(call install_fixup, bash,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, bash,DEPENDS,)
+	@$(call install_fixup, bash,DESCRIPTION,missing)
+
+	@$(call install_copy, bash, 0, 0, 0755, $(BASH_DIR)/bash, /bin/bash)
+	@$(call install_link, bash, bash, /bin/sh)
+
+	@$(call install_finish, bash)
 
 	@$(call touch, $@)
 
diff --git a/rules/bing.make b/rules/bing.make
index 5693a9e89..bcb9e9012 100644
--- a/rules/bing.make
+++ b/rules/bing.make
@@ -98,16 +98,16 @@ bing_targetinstall: $(STATEDIR)/bing.targetinstall
 $(STATEDIR)/bing.targetinstall: $(bing_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,bing)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(BING_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-	@$(call install_copy, 0, 0, 0755, $(BING_DIR)/bing, /usr/sbin/bing)
-	@$(call install_finish)
+	@$(call install_init, bing)
+	@$(call install_fixup, bing,PACKAGE,bing)
+	@$(call install_fixup, bing,PRIORITY,optional)
+	@$(call install_fixup, bing,VERSION,$(BING_VERSION))
+	@$(call install_fixup, bing,SECTION,base)
+	@$(call install_fixup, bing,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, bing,DEPENDS,)
+	@$(call install_fixup, bing,DESCRIPTION,missing)
+	@$(call install_copy, bing, 0, 0, 0755, $(BING_DIR)/bing, /usr/sbin/bing)
+	@$(call install_finish, bing)
 
 	@$(call touch, $@)
 
diff --git a/rules/binutils.make b/rules/binutils.make
index b6616f78a..37cd893a5 100644
--- a/rules/binutils.make
+++ b/rules/binutils.make
@@ -128,19 +128,19 @@ binutils_targetinstall: $(STATEDIR)/binutils.targetinstall
 $(STATEDIR)/binutils.targetinstall: $(binutils_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,binutils)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(PTXCONF_BINUTILS_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, binutils)
+	@$(call install_fixup, binutils,PACKAGE,binutils)
+	@$(call install_fixup, binutils,PRIORITY,optional)
+	@$(call install_fixup, binutils,VERSION,$(PTXCONF_BINUTILS_VERSION))
+	@$(call install_fixup, binutils,SECTION,base)
+	@$(call install_fixup, binutils,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, binutils,DEPENDS,)
+	@$(call install_fixup, binutils,DESCRIPTION,missing)
 
 	# FIXME: this will probably not work with the wildcard; fix when it breaks :-) 
-	@$(call install_copy, 0, 0, 0644, $(BINUTILS_BUILDDIR)/bfd/.libs/libbfd*.so, /usr/lib)
+	@$(call install_copy, binutils, 0, 0, 0644, $(BINUTILS_BUILDDIR)/bfd/.libs/libbfd*.so, /usr/lib)
 
-	@$(call install_finish)
+	@$(call install_finish, binutils)
 	
 	@$(call touch, $@)
 
diff --git a/rules/blackbox.make b/rules/blackbox.make
index a951f0d93..bc4f8e96c 100644
--- a/rules/blackbox.make
+++ b/rules/blackbox.make
@@ -112,19 +112,19 @@ blackbox_targetinstall: $(STATEDIR)/blackbox.targetinstall
 $(STATEDIR)/blackbox.targetinstall: $(blackbox_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,blackbox)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(BLACKBOX_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(BLACKBOX_DIR)/src/blackbox, /usr/X11R6/bin/blackbox)
-	@$(call install_copy, 0, 0, 0755, $(BLACKBOX_DIR)/util/bsetroot, /usr/X11R6/bin/bsetroot)
-
-	@$(call install_finish)
+	@$(call install_init, blackbox)
+	@$(call install_fixup, blackbox,PACKAGE,blackbox)
+	@$(call install_fixup, blackbox,PRIORITY,optional)
+	@$(call install_fixup, blackbox,VERSION,$(BLACKBOX_VERSION))
+	@$(call install_fixup, blackbox,SECTION,base)
+	@$(call install_fixup, blackbox,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, blackbox,DEPENDS,)
+	@$(call install_fixup, blackbox,DESCRIPTION,missing)
+
+	@$(call install_copy, blackbox, 0, 0, 0755, $(BLACKBOX_DIR)/src/blackbox, /usr/X11R6/bin/blackbox)
+	@$(call install_copy, blackbox, 0, 0, 0755, $(BLACKBOX_DIR)/util/bsetroot, /usr/X11R6/bin/bsetroot)
+
+	@$(call install_finish, blackbox)
 
 	@$(call touch, $@)
 
diff --git a/rules/bluez-libs.make b/rules/bluez-libs.make
index 45af8d8bc..4140692b8 100644
--- a/rules/bluez-libs.make
+++ b/rules/bluez-libs.make
@@ -106,19 +106,19 @@ bluez-libs_targetinstall: $(STATEDIR)/bluez-libs.targetinstall
 $(STATEDIR)/bluez-libs.targetinstall: $(bluez-libs_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,bluez-libs)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(BLUEZ_LIBS_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, bluez-libs)
+	@$(call install_fixup, bluez-libs,PACKAGE,bluez-libs)
+	@$(call install_fixup, bluez-libs,PRIORITY,optional)
+	@$(call install_fixup, bluez-libs,VERSION,$(BLUEZ_LIBS_VERSION))
+	@$(call install_fixup, bluez-libs,SECTION,base)
+	@$(call install_fixup, bluez-libs,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, bluez-libs,DEPENDS,)
+	@$(call install_fixup, bluez-libs,DESCRIPTION,missing)
 
 	# FIXME: wait for patch from Sandro Noel
-#	@$(call install_copy, 0, 0, 0755, $(BLUEZ_LIBS_DIR)/foobar, /dev/null)
+#	@$(call install_copy, bluez-libs, 0, 0, 0755, $(BLUEZ_LIBS_DIR)/foobar, /dev/null)
 
-	@$(call install_finish)
+	@$(call install_finish, bluez-libs)
 
 	@$(call touch, $@)
 
diff --git a/rules/bluez-utils.make b/rules/bluez-utils.make
index 2eedd9e0f..c12a555bd 100644
--- a/rules/bluez-utils.make
+++ b/rules/bluez-utils.make
@@ -114,19 +114,19 @@ bluez-utils_targetinstall: $(STATEDIR)/bluez-utils.targetinstall
 $(STATEDIR)/bluez-utils.targetinstall: $(bluez-utils_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,bluez-utils)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(BLUEZ_UTILS_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, bluez-utils)
+	@$(call install_fixup, bluez-utils,PACKAGE,bluez-utils)
+	@$(call install_fixup, bluez-utils,PRIORITY,optional)
+	@$(call install_fixup, bluez-utils,VERSION,$(BLUEZ_UTILS_VERSION))
+	@$(call install_fixup, bluez-utils,SECTION,base)
+	@$(call install_fixup, bluez-utils,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, bluez-utils,DEPENDS,)
+	@$(call install_fixup, bluez-utils,DESCRIPTION,missing)
 
 	# FIXME: wait for patch from Sandro Noel
-#	@$(call install_copy, 0, 0, 0755, $(BLUEZ_UTILS_DIR)/foobar, /dev/null)
+#	@$(call install_copy, bluez-utils, 0, 0, 0755, $(BLUEZ_UTILS_DIR)/foobar, /dev/null)
 
-	@$(call install_finish)
+	@$(call install_finish, bluez-utils)
 
 	@$(call touch, $@)
 
diff --git a/rules/bonniexx.make b/rules/bonniexx.make
index ef22610ee..f2078a4d1 100644
--- a/rules/bonniexx.make
+++ b/rules/bonniexx.make
@@ -112,18 +112,18 @@ bonniexx_targetinstall: $(STATEDIR)/bonniexx.targetinstall
 $(STATEDIR)/bonniexx.targetinstall: $(bonniexx_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,bonniexx)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(COREUTILS_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(BONNIEXX_DIR)/bonnie++, /usr/bin/bonnie++)
-
-	@$(call install_finish)
+	@$(call install_init, bonniexx)
+	@$(call install_fixup, bonniexx,PACKAGE,bonniexx)
+	@$(call install_fixup, bonniexx,PRIORITY,optional)
+	@$(call install_fixup, bonniexx,VERSION,$(COREUTILS_VERSION))
+	@$(call install_fixup, bonniexx,SECTION,base)
+	@$(call install_fixup, bonniexx,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, bonniexx,DEPENDS,)
+	@$(call install_fixup, bonniexx,DESCRIPTION,missing)
+
+	@$(call install_copy, bonniexx, 0, 0, 0755, $(BONNIEXX_DIR)/bonnie++, /usr/bin/bonnie++)
+
+	@$(call install_finish, bonniexx)
 
 	@$(call touch, $@)
 
diff --git a/rules/busybox.make b/rules/busybox.make
index 0243d9c57..1189b02f3 100644
--- a/rules/busybox.make
+++ b/rules/busybox.make
@@ -125,31 +125,31 @@ busybox_targetinstall: $(STATEDIR)/busybox.targetinstall
 $(STATEDIR)/busybox.targetinstall: $(busybox_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,busybox)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(BUSYBOX_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, busybox)
+	@$(call install_fixup, busybox,PACKAGE,busybox)
+	@$(call install_fixup, busybox,PRIORITY,optional)
+	@$(call install_fixup, busybox,VERSION,$(BUSYBOX_VERSION))
+	@$(call install_fixup, busybox,SECTION,base)
+	@$(call install_fixup, busybox,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, busybox,DEPENDS,)
+	@$(call install_fixup, busybox,DESCRIPTION,missing)
 
 	rm -f $(BUSYBOX_DIR)/busybox.links
 	cd $(BUSYBOX_DIR) && $(MAKE) busybox.links
 
-	@$(call install_copy, 0, 0, 1555, $(BUSYBOX_DIR)/busybox, /bin/busybox)
+	@$(call install_copy, busybox, 0, 0, 1555, $(BUSYBOX_DIR)/busybox, /bin/busybox)
 	for file in `cat $(BUSYBOX_DIR)/busybox.links`; do	\
-		$(call install_link, /bin/busybox, $$file);	\
+		$(call install_link, busybox, /bin/busybox, $$file);	\
 	done
 
 ifdef PTXCONF_BB_CONFIG_VI
 	vimfile=`mktemp`; \
 	echo "#!/bin/sh" >> $$vimfile; \
 	echo "/bin/vi $*" >> $$vimfile; \
-	$(call install_copy, 0, 0, 0755, $$vimfile, /usr/bin/vim, ); \
+	$(call install_copy, busybox, 0, 0, 0755, $$vimfile, /usr/bin/vim, ); \
 	rm $$vimfile
 endif
-	@$(call install_finish)
+	@$(call install_finish, busybox)
 
 	@$(call touch, $@)
 
diff --git a/rules/canutils.make b/rules/canutils.make
index a5280542f..75518c988 100644
--- a/rules/canutils.make
+++ b/rules/canutils.make
@@ -108,31 +108,31 @@ canutils_targetinstall: $(STATEDIR)/canutils.targetinstall
 $(STATEDIR)/canutils.targetinstall: $(canutils_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,canutils)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(CANUTILS_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, canutils)
+	@$(call install_fixup, canutils,PACKAGE,canutils)
+	@$(call install_fixup, canutils,PRIORITY,optional)
+	@$(call install_fixup, canutils,VERSION,$(CANUTILS_VERSION))
+	@$(call install_fixup, canutils,SECTION,base)
+	@$(call install_fixup, canutils,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, canutils,DEPENDS,)
+	@$(call install_fixup, canutils,DESCRIPTION,missing)
 
 ifdef PTXCONF_CANUTILS_CANCONFIG
-	@$(call install_copy, 0, 0, 0755, $(CANUTILS_DIR)/src/canconfig, /sbin/canconfig)
+	@$(call install_copy, canutils, 0, 0, 0755, $(CANUTILS_DIR)/src/canconfig, /sbin/canconfig)
 endif
 ifdef PTXCONF_CANUTILS_CANECHO
-	@$(call install_copy, 0, 0, 0755, $(CANUTILS_DIR)/src/canecho,   /sbin/canecho)
+	@$(call install_copy, canutils, 0, 0, 0755, $(CANUTILS_DIR)/src/canecho,   /sbin/canecho)
 endif
 ifdef PTXCONF_CANUTILS_CANDUMP
-	@$(call install_copy, 0, 0, 0755, $(CANUTILS_DIR)/src/candump,   /sbin/candump)
+	@$(call install_copy, canutils, 0, 0, 0755, $(CANUTILS_DIR)/src/candump,   /sbin/candump)
 endif
 ifdef PTXCONF_CANUTILS_CANSEND
-	@$(call install_copy, 0, 0, 0755, $(CANUTILS_DIR)/src/cansend,   /sbin/cansend)
+	@$(call install_copy, canutils, 0, 0, 0755, $(CANUTILS_DIR)/src/cansend,   /sbin/cansend)
 endif
 ifdef PTXCONF_CANUTILS_CANSEQUENCE
-	@$(call install_copy, 0, 0, 0755, $(CANUTILS_DIR)/src/cansequence, /sbin/cansequence)
+	@$(call install_copy, canutils, 0, 0, 0755, $(CANUTILS_DIR)/src/cansequence, /sbin/cansequence)
 endif
-	@$(call install_finish)
+	@$(call install_finish, canutils)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/cfgsh.make b/rules/cfgsh.make
index 33e87463f..db32439b3 100644
--- a/rules/cfgsh.make
+++ b/rules/cfgsh.make
@@ -109,16 +109,16 @@ cfgsh_targetinstall: $(STATEDIR)/cfgsh.targetinstall
 $(STATEDIR)/cfgsh.targetinstall: $(cfgsh_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,cfgsh)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(CFGSH_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Gilad Ben-Yossef <gilad\@codefidence.com>")
-	@$(call install_fixup,DEPENDS, readline)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, $(CFGSH_DIR)/cfgsh, /bin/cfgsh)
+	@$(call install_init, cfgsh)
+	@$(call install_fixup, cfgsh,PACKAGE,cfgsh)
+	@$(call install_fixup, cfgsh,PRIORITY,optional)
+	@$(call install_fixup, cfgsh,VERSION,$(CFGSH_VERSION))
+	@$(call install_fixup, cfgsh,SECTION,base)
+	@$(call install_fixup, cfgsh,AUTHOR,"Gilad Ben-Yossef <gilad\@codefidence.com>")
+	@$(call install_fixup, cfgsh,DEPENDS, readline)
+	@$(call install_fixup, cfgsh,DESCRIPTION,missing)
+
+	@$(call install_copy, cfgsh, 0, 0, 0644, $(CFGSH_DIR)/cfgsh, /bin/cfgsh)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/chrony.make b/rules/chrony.make
index 16e9adea4..9b73c1dc3 100644
--- a/rules/chrony.make
+++ b/rules/chrony.make
@@ -107,19 +107,19 @@ chrony_targetinstall: $(STATEDIR)/chrony.targetinstall
 $(STATEDIR)/chrony.targetinstall: $(chrony_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,chrony)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(CHRONY_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(CHRONY_DIR)/chronyd, /usr/sbin/chronyd)
-	@$(call install_copy, 0, 0, 0755, $(CHRONY_DIR)/chronyc, /usr/bin/chronyc)
-
-	@$(call install_finish)
+	@$(call install_init, chrony)
+	@$(call install_fixup, chrony,PACKAGE,chrony)
+	@$(call install_fixup, chrony,PRIORITY,optional)
+	@$(call install_fixup, chrony,VERSION,$(CHRONY_VERSION))
+	@$(call install_fixup, chrony,SECTION,base)
+	@$(call install_fixup, chrony,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, chrony,DEPENDS,)
+	@$(call install_fixup, chrony,DESCRIPTION,missing)
+
+	@$(call install_copy, chrony, 0, 0, 0755, $(CHRONY_DIR)/chronyd, /usr/sbin/chronyd)
+	@$(call install_copy, chrony, 0, 0, 0755, $(CHRONY_DIR)/chronyc, /usr/bin/chronyc)
+
+	@$(call install_finish, chrony)
 
 	@$(call touch, $@)
 
diff --git a/rules/clementine.make b/rules/clementine.make
index 3e9dfc329..792516c2b 100644
--- a/rules/clementine.make
+++ b/rules/clementine.make
@@ -98,18 +98,18 @@ clementine_targetinstall: $(STATEDIR)/clementine.targetinstall
 $(STATEDIR)/clementine.targetinstall: $(clementine_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,clementine)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(CLEMENTINE_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, clementine)
+	@$(call install_fixup, clementine,PACKAGE,clementine)
+	@$(call install_fixup, clementine,PRIORITY,optional)
+	@$(call install_fixup, clementine,VERSION,$(CLEMENTINE_VERSION))
+	@$(call install_fixup, clementine,SECTION,base)
+	@$(call install_fixup, clementine,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, clementine,DEPENDS,)
+	@$(call install_fixup, clementine,DESCRIPTION,missing)
 	
-	@$(call install_copy, 0, 0, 0755, $(CLEMENTINE_DIR)/clementine, /usr/X11R6/bin/clementine)
+	@$(call install_copy, clementine, 0, 0, 0755, $(CLEMENTINE_DIR)/clementine, /usr/X11R6/bin/clementine)
 
-	@$(call install_finish)
+	@$(call install_finish, clementine)
 
 	@$(call touch, $@)
 
diff --git a/rules/clock.make b/rules/clock.make
index 6e49e1df2..494f95a5d 100644
--- a/rules/clock.make
+++ b/rules/clock.make
@@ -98,18 +98,18 @@ clock_targetinstall: $(STATEDIR)/clock.targetinstall
 $(STATEDIR)/clock.targetinstall: $(clock_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,clock)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(CLOCK_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(CLOCK_DIR)/clock, /sbin/clock)
-
-	@$(call install_finish)
+	@$(call install_init, clock)
+	@$(call install_fixup, clock,PACKAGE,clock)
+	@$(call install_fixup, clock,PRIORITY,optional)
+	@$(call install_fixup, clock,VERSION,$(CLOCK_VERSION))
+	@$(call install_fixup, clock,SECTION,base)
+	@$(call install_fixup, clock,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, clock,DEPENDS,)
+	@$(call install_fixup, clock,DESCRIPTION,missing)
+
+	@$(call install_copy, clock, 0, 0, 0755, $(CLOCK_DIR)/clock, /sbin/clock)
+
+	@$(call install_finish, clock)
 
 	@$(call touch, $@)
 
diff --git a/rules/commoncpp2.make b/rules/commoncpp2.make
index 142f7ce77..d458b84d6 100644
--- a/rules/commoncpp2.make
+++ b/rules/commoncpp2.make
@@ -106,30 +106,30 @@ commoncpp2_targetinstall: $(STATEDIR)/commoncpp2.targetinstall
 $(STATEDIR)/commoncpp2.targetinstall: $(commoncpp2_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,commoncpp2)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(COMMONCPP2_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_init, commoncpp2)
+	@$(call install_fixup, commoncpp2,PACKAGE,commoncpp2)
+	@$(call install_fixup, commoncpp2,PRIORITY,optional)
+	@$(call install_fixup, commoncpp2,VERSION,$(COMMONCPP2_VERSION))
+	@$(call install_fixup, commoncpp2,SECTION,base)
+	@$(call install_fixup, commoncpp2,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, commoncpp2,DEPENDS,)
+	@$(call install_fixup, commoncpp2,DESCRIPTION,missing)
+
+	@$(call install_copy, commoncpp2, 0, 0, 0644, \
 		$(COMMONCPP2_DIR)/src/.libs/libccgnu2-1.3.so.1.0.18, \
 		/usr/lib/libccgnu2-1.3.so.1.0.18)
 
-	@$(call install_link, libccgnu2-1.3.so.1.0.18, /usr/lib/libccgnu2-1.3.so.1)
-	@$(call install_link, libccgnu2-1.3.so.1.0.18, /usr/lib/libccgnu2-1.3.so)
+	@$(call install_link, commoncpp2, libccgnu2-1.3.so.1.0.18, /usr/lib/libccgnu2-1.3.so.1)
+	@$(call install_link, commoncpp2, libccgnu2-1.3.so.1.0.18, /usr/lib/libccgnu2-1.3.so)
 
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, commoncpp2, 0, 0, 0644, \
 		$(COMMONCPP2_DIR)/src/.libs/libccext2-1.3.so.1.0.18, \
 		/usr/lib/libccext2-1.3.so.1.0.18)
 
-	@$(call install_link, libccext2-1.3.so.1.0.18, /usr/lib/libccext2-1.3.so.1)
-	@$(call install_link, libccext2-1.3.so.1.0.18, /usr/lib/libccext2-1.3.so)
+	@$(call install_link, commoncpp2, libccext2-1.3.so.1.0.18, /usr/lib/libccext2-1.3.so.1)
+	@$(call install_link, commoncpp2, libccext2-1.3.so.1.0.18, /usr/lib/libccext2-1.3.so)
 
-	@$(call install_finish)
+	@$(call install_finish, commoncpp2)
 
 	@$(call touch, $@)
 
diff --git a/rules/coreutils.make b/rules/coreutils.make
index 33c113d64..e9ef7af79 100644
--- a/rules/coreutils.make
+++ b/rules/coreutils.make
@@ -127,29 +127,29 @@ coreutils_targetinstall: $(STATEDIR)/coreutils.targetinstall
 $(STATEDIR)/coreutils.targetinstall: $(coreutils_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,coreutils)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(COREUTILS_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, coreutils)
+	@$(call install_fixup, coreutils,PACKAGE,coreutils)
+	@$(call install_fixup, coreutils,PRIORITY,optional)
+	@$(call install_fixup, coreutils,VERSION,$(COREUTILS_VERSION))
+	@$(call install_fixup, coreutils,SECTION,base)
+	@$(call install_fixup, coreutils,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, coreutils,DEPENDS,)
+	@$(call install_fixup, coreutils,DESCRIPTION,missing)
 	
 ifdef PTXCONF_COREUTILS_CP
-	@$(call install_copy, 0, 0, 0755, $(COREUTILS_DIR)/src/cp, /bin/cp)
+	@$(call install_copy, coreutils, 0, 0, 0755, $(COREUTILS_DIR)/src/cp, /bin/cp)
 endif
 ifdef PTXCONF_COREUTILS_DD
-	@$(call install_copy, 0, 0, 0755, $(COREUTILS_DIR)/src/dd, /bin/dd)	
+	@$(call install_copy, coreutils, 0, 0, 0755, $(COREUTILS_DIR)/src/dd, /bin/dd)	
 endif
 ifdef PTXCONF_COREUTILS_MD5SUM
-	@$(call install_copy, 0, 0, 0755, $(COREUTILS_DIR)/src/md5sum, /bin/md5sum)
+	@$(call install_copy, coreutils, 0, 0, 0755, $(COREUTILS_DIR)/src/md5sum, /bin/md5sum)
 endif
 ifdef PTXCONF_COREUTILS_SEQ
-	@$(call install_copy, 0, 0, 0755, $(COREUTILS_DIR)/src/seq, /usr/bin/seq)
+	@$(call install_copy, coreutils, 0, 0, 0755, $(COREUTILS_DIR)/src/seq, /usr/bin/seq)
 endif
 
-	@$(call install_finish)
+	@$(call install_finish, coreutils)
 
 	@$(call touch, $@)
 
diff --git a/rules/cppunit.make b/rules/cppunit.make
index fe010650f..491356c0c 100644
--- a/rules/cppunit.make
+++ b/rules/cppunit.make
@@ -107,23 +107,23 @@ cppunit_targetinstall: $(STATEDIR)/cppunit.targetinstall
 $(STATEDIR)/cppunit.targetinstall: $(cppunit_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,$(CPPUNIT))
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(CPPUNIT_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Shahar Livne <shahar\@livnex.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_init, cppunit)
+	@$(call install_fixup, cppunit,PACKAGE,$(CPPUNIT))
+	@$(call install_fixup, cppunit,PRIORITY,optional)
+	@$(call install_fixup, cppunit,VERSION,$(CPPUNIT_VERSION))
+	@$(call install_fixup, cppunit,SECTION,base)
+	@$(call install_fixup, cppunit,AUTHOR,"Shahar Livne <shahar\@livnex.com>")
+	@$(call install_fixup, cppunit,DEPENDS,)
+	@$(call install_fixup, cppunit,DESCRIPTION,missing)
+
+	@$(call install_copy, cppunit, 0, 0, 0644, \
 		$(CPPUNIT_DIR)/src/cppunit/.libs/libcppunit-1.10.so.2.0.0, \
 		/usr/lib/libcppunit-1.10.so.2.0.0)
 
-	@$(call install_link, libcppunit-1.10.so.2.0.0, /usr/lib/libcppunit-1.10.so.2)
-	@$(call install_link, libcppunit-1.10.so.2.0.0, /usr/lib/libcppunit.so)
+	@$(call install_link, cppunit, libcppunit-1.10.so.2.0.0, /usr/lib/libcppunit-1.10.so.2)
+	@$(call install_link, cppunit, libcppunit-1.10.so.2.0.0, /usr/lib/libcppunit.so)
 
-	@$(call install_finish)
+	@$(call install_finish, cppunit)
 
 	@$(call touch, $@)
 
diff --git a/rules/cyclictest.make b/rules/cyclictest.make
index c699526e0..8a6b82310 100644
--- a/rules/cyclictest.make
+++ b/rules/cyclictest.make
@@ -108,18 +108,18 @@ cyclictest_targetinstall: $(STATEDIR)/cyclictest.targetinstall
 $(STATEDIR)/cyclictest.targetinstall: $(cyclictest_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,cyclictest)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(CYCLICTEST_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(CYCLICTEST_DIR)/foobar, /dev/null)
-
-	@$(call install_finish)
+	@$(call install_init, cyclictest)
+	@$(call install_fixup, cyclictest,PACKAGE,cyclictest)
+	@$(call install_fixup, cyclictest,PRIORITY,optional)
+	@$(call install_fixup, cyclictest,VERSION,$(CYCLICTEST_VERSION))
+	@$(call install_fixup, cyclictest,SECTION,base)
+	@$(call install_fixup, cyclictest,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, cyclictest,DEPENDS,)
+	@$(call install_fixup, cyclictest,DESCRIPTION,missing)
+
+	@$(call install_copy, cyclictest, 0, 0, 0755, $(CYCLICTEST_DIR)/foobar, /dev/null)
+
+	@$(call install_finish, cyclictest)
 
 	@$(call touch, $@)
 
diff --git a/rules/db41.make b/rules/db41.make
index 810dc1339..bf23e90fe 100644
--- a/rules/db41.make
+++ b/rules/db41.make
@@ -108,21 +108,21 @@ db41_targetinstall: $(STATEDIR)/db41.targetinstall
 $(STATEDIR)/db41.targetinstall: $(db41_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,db41)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(DB41_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, db41)
+	@$(call install_fixup, db41,PACKAGE,db41)
+	@$(call install_fixup, db41,PRIORITY,optional)
+	@$(call install_fixup, db41,VERSION,$(DB41_VERSION))
+	@$(call install_fixup, db41,SECTION,base)
+	@$(call install_fixup, db41,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, db41,DEPENDS,)
+	@$(call install_fixup, db41,DESCRIPTION,missing)
 	
 	# FIXME: RSC: the wildcard will probably break; fix when needed :-) 
 	# FIXME: RSC: use correct paths from the build directories
-	@$(call install_copy, 0, 0, 0755, $(CROSS_LIB_DIR)/bin/db_*, /usr/bin/)
-	@$(call install_copy, 0, 0, 0644, $(CROSS_LIB_DIR)/lib/libdb*.so*, /usr/lib/)
+	@$(call install_copy, db41, 0, 0, 0755, $(CROSS_LIB_DIR)/bin/db_*, /usr/bin/)
+	@$(call install_copy, db41, 0, 0, 0644, $(CROSS_LIB_DIR)/lib/libdb*.so*, /usr/lib/)
 
-	@$(call install_finish)
+	@$(call install_finish, db41)
 
 	@$(call touch, $@)
 
diff --git a/rules/dbench.make b/rules/dbench.make
index 22c27636b..822b6af4e 100644
--- a/rules/dbench.make
+++ b/rules/dbench.make
@@ -107,32 +107,32 @@ dbench_targetinstall: $(STATEDIR)/dbench.targetinstall
 $(STATEDIR)/dbench.targetinstall: $(dbench_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,dbench)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(DBENCH_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, dbench)
+	@$(call install_fixup, dbench,PACKAGE,dbench)
+	@$(call install_fixup, dbench,PRIORITY,optional)
+	@$(call install_fixup, dbench,VERSION,$(DBENCH_VERSION))
+	@$(call install_fixup, dbench,SECTION,base)
+	@$(call install_fixup, dbench,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, dbench,DEPENDS,)
+	@$(call install_fixup, dbench,DESCRIPTION,missing)
 
 ifdef PTXCONF_DBENCH_DBENCH
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, dbench, 0, 0, 0755, \
 		$(DBENCH_DIR)/dbench, \
 		$(PTXCONF_TESTSUITE_DIR)/$(DBENCH)/dbench)
 endif
 ifdef PTXCONF_DBENCH_TBENCH
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, dbench, 0, 0, 0755, \
 		$(DBENCH_DIR)/tbench, \
 		$(PTXCONF_TESTSUITE_DIR)/$(DBENCH)/tbench)
 endif
 ifdef PTXCONF_DBENCH_TBENCH_SERVER
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, dbench, 0, 0, 0755, \
 		$(DBENCH_DIR)/tbench_srv, \
 		$(PTXCONF_TESTSUITE_DIR)/$(DBENCH)/tbench_srv)
 endif
 
-	@$(call install_finish)
+	@$(call install_finish, dbench)
 
 	@$(call touch, $@)
 
diff --git a/rules/dhcp.make b/rules/dhcp.make
index 141b6ad4d..f53a91dbc 100644
--- a/rules/dhcp.make
+++ b/rules/dhcp.make
@@ -103,18 +103,18 @@ dhcp_targetinstall: $(STATEDIR)/dhcp.targetinstall
 $(STATEDIR)/dhcp.targetinstall: $(dhcp_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,dhcp)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(DHCP_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, dhcp)
+	@$(call install_fixup, dhcp,PACKAGE,dhcp)
+	@$(call install_fixup, dhcp,PRIORITY,optional)
+	@$(call install_fixup, dhcp,VERSION,$(DHCP_VERSION))
+	@$(call install_fixup, dhcp,SECTION,base)
+	@$(call install_fixup, dhcp,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, dhcp,DEPENDS,)
+	@$(call install_fixup, dhcp,DESCRIPTION,missing)
 	
-	@$(call install_copy, 0, 0, 0755, $(DHCP_DIR)/work.linux-2.2/server/dhcpd, /usr/sbin/dhcpd)
+	@$(call install_copy, dhcp, 0, 0, 0755, $(DHCP_DIR)/work.linux-2.2/server/dhcpd, /usr/sbin/dhcpd)
 
-	@$(call install_finish)
+	@$(call install_finish, dhcp)
 
 	@$(call touch, $@)
 
diff --git a/rules/diffutils.make b/rules/diffutils.make
index 42cb3ed9f..4c68fb13c 100644
--- a/rules/diffutils.make
+++ b/rules/diffutils.make
@@ -106,29 +106,29 @@ diffutils_targetinstall: $(STATEDIR)/diffutils.targetinstall
 $(STATEDIR)/diffutils.targetinstall: $(diffutils_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,diffutils)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(DIFFUTILS_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, diffutils)
+	@$(call install_fixup, diffutils,PACKAGE,diffutils)
+	@$(call install_fixup, diffutils,PRIORITY,optional)
+	@$(call install_fixup, diffutils,VERSION,$(DIFFUTILS_VERSION))
+	@$(call install_fixup, diffutils,SECTION,base)
+	@$(call install_fixup, diffutils,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, diffutils,DEPENDS,)
+	@$(call install_fixup, diffutils,DESCRIPTION,missing)
 
 ifdef PTXCONF_DIFFUTILS_DIFF
-	@$(call install_copy, 0, 0, 0755, $(DIFFUTILS_DIR)/src/diff, /usr/bin/diff)
+	@$(call install_copy, diffutils, 0, 0, 0755, $(DIFFUTILS_DIR)/src/diff, /usr/bin/diff)
 endif
 ifdef PTXCONF_DIFFUTILS_DIFF3
-	@$(call install_copy, 0, 0, 0755, $(DIFFUTILS_DIR)/src/diff3, /usr/bin/diff3)
+	@$(call install_copy, diffutils, 0, 0, 0755, $(DIFFUTILS_DIR)/src/diff3, /usr/bin/diff3)
 endif
 ifdef PTXCONF_DIFFUTILS_SDIFF
-	@$(call install_copy, 0, 0, 0755, $(DIFFUTILS_DIR)/src/diff, /usr/bin/sdiff)
+	@$(call install_copy, diffutils, 0, 0, 0755, $(DIFFUTILS_DIR)/src/diff, /usr/bin/sdiff)
 endif
 ifdef PTXCONF_DIFFUTILS_CMP
-	@$(call install_copy, 0, 0, 0755, $(DIFFUTILS_DIR)/src/cmp, /usr/bin/cmp)
+	@$(call install_copy, diffutils, 0, 0, 0755, $(DIFFUTILS_DIR)/src/cmp, /usr/bin/cmp)
 endif
 
-	@$(call install_finish)
+	@$(call install_finish, diffutils)
 
 	@$(call touch, $@)
 
diff --git a/rules/dnsmasq.make b/rules/dnsmasq.make
index a010b55d6..df503579e 100644
--- a/rules/dnsmasq.make
+++ b/rules/dnsmasq.make
@@ -97,18 +97,18 @@ dnsmasq_targetinstall: $(STATEDIR)/dnsmasq.targetinstall
 $(STATEDIR)/dnsmasq.targetinstall: $(dnsmasq_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,dnsmasq)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(DNSMASQ_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, dnsmasq)
+	@$(call install_fixup, dnsmasq,PACKAGE,dnsmasq)
+	@$(call install_fixup, dnsmasq,PRIORITY,optional)
+	@$(call install_fixup, dnsmasq,VERSION,$(DNSMASQ_VERSION))
+	@$(call install_fixup, dnsmasq,SECTION,base)
+	@$(call install_fixup, dnsmasq,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, dnsmasq,DEPENDS,)
+	@$(call install_fixup, dnsmasq,DESCRIPTION,missing)
 	
-	@$(call install_copy, 0, 0, 0755, $(DNSMASQ_DIR)/src/dnsmasq, /sbin/dnsmasq)
+	@$(call install_copy, dnsmasq, 0, 0, 0755, $(DNSMASQ_DIR)/src/dnsmasq, /sbin/dnsmasq)
 
-	@$(call install_finish)
+	@$(call install_finish, dnsmasq)
 	
 	@$(call touch, $@)
 
diff --git a/rules/dosfstools.make b/rules/dosfstools.make
index 11b31e711..aca5be86f 100644
--- a/rules/dosfstools.make
+++ b/rules/dosfstools.make
@@ -103,29 +103,29 @@ dosfstools_targetinstall: $(STATEDIR)/dosfstools.targetinstall
 $(STATEDIR)/dosfstools.targetinstall: $(dosfstools_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,dosfstools)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(DOSFSTOOLS_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Steven Scholz <steven.scholz\@imc-berlin.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, dosfstools)
+	@$(call install_fixup, dosfstools,PACKAGE,dosfstools)
+	@$(call install_fixup, dosfstools,PRIORITY,optional)
+	@$(call install_fixup, dosfstools,VERSION,$(DOSFSTOOLS_VERSION))
+	@$(call install_fixup, dosfstools,SECTION,base)
+	@$(call install_fixup, dosfstools,AUTHOR,"Steven Scholz <steven.scholz\@imc-berlin.de>")
+	@$(call install_fixup, dosfstools,DEPENDS,)
+	@$(call install_fixup, dosfstools,DESCRIPTION,missing)
 
 ifdef PTXCONF_DOSFSTOOLS_MKDOSFS
-	@$(call install_copy, 0, 0, 0755, $(DOSFSTOOLS_DIR)/mkdosfs/mkdosfs, /sbin/mkdosfs)
+	@$(call install_copy, dosfstools, 0, 0, 0755, $(DOSFSTOOLS_DIR)/mkdosfs/mkdosfs, /sbin/mkdosfs)
 ifdef PTXCONF_DOSFSTOOLS_MKDOSFS_MSDOS
-	@$(call install_link, mkdosfs, /sbin/mkfs.msdos)
+	@$(call install_link, dosfstools, mkdosfs, /sbin/mkfs.msdos)
 endif
 ifdef PTXCONF_DOSFSTOOLS_MKDOSFS_VFAT
-	@$(call install_link, mkdosfs, /sbin/mkfs.vfat)
+	@$(call install_link, dosfstools, mkdosfs, /sbin/mkfs.vfat)
 endif
 endif
 ifdef PTXCONF_DOSFSTOOLS_DOSFSCK
-	@$(call install_copy, 0, 0, 0755, $(DOSFSTOOLS_DIR)/dosfsck/dosfsck, /sbin/dosfsck)
+	@$(call install_copy, dosfstools, 0, 0, 0755, $(DOSFSTOOLS_DIR)/dosfsck/dosfsck, /sbin/dosfsck)
 endif
 
-	@$(call install_finish)
+	@$(call install_finish, dosfstools)
 
 	@$(call touch, $@)
 
diff --git a/rules/dropbear.make b/rules/dropbear.make
index 9ffada873..6a73ba6fb 100644
--- a/rules/dropbear.make
+++ b/rules/dropbear.make
@@ -246,32 +246,32 @@ dropbear_targetinstall: $(STATEDIR)/dropbear.targetinstall
 $(STATEDIR)/dropbear.targetinstall: $(dropbear_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,dropbear)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(DROPBEAR_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, dropbear)
+	@$(call install_fixup, dropbear,PACKAGE,dropbear)
+	@$(call install_fixup, dropbear,PRIORITY,optional)
+	@$(call install_fixup, dropbear,VERSION,$(DROPBEAR_VERSION))
+	@$(call install_fixup, dropbear,SECTION,base)
+	@$(call install_fixup, dropbear,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, dropbear,DEPENDS,)
+	@$(call install_fixup, dropbear,DESCRIPTION,missing)
 
 ifdef PTXCONF_DROPBEAR_DROPBEAR
-	@$(call install_copy, 0, 0, 0755, $(DROPBEAR_DIR)/dropbear, /usr/sbin/dropbear)
+	@$(call install_copy, dropbear, 0, 0, 0755, $(DROPBEAR_DIR)/dropbear, /usr/sbin/dropbear)
 endif
 
 ifdef PTXCONF_DROPBEAR_DROPBEAR_KEY
-	@$(call install_copy, 0, 0, 0755, $(DROPBEAR_DIR)/dropbearkey, /usr/sbin/dropbearkey)
+	@$(call install_copy, dropbear, 0, 0, 0755, $(DROPBEAR_DIR)/dropbearkey, /usr/sbin/dropbearkey)
 endif
 
 ifdef PTXCONF_DROPBEAR_DROPBEAR_CONVERT
-	@$(call install_copy, 0, 0, 0755, $(DROPBEAR_DIR)/dropbearconvert, /usr/sbin/dropbearconvert)
+	@$(call install_copy, dropbear, 0, 0, 0755, $(DROPBEAR_DIR)/dropbearconvert, /usr/sbin/dropbearconvert)
 endif
 
 ifdef PTXCONF_DROPBEAR_SCP
-	@$(call install_copy, 0, 0, 0755, $(DROPBEAR_DIR)/scp, /usr/bin/scp)
+	@$(call install_copy, dropbear, 0, 0, 0755, $(DROPBEAR_DIR)/scp, /usr/bin/scp)
 endif
 
-	@$(call install_finish)
+	@$(call install_finish, dropbear)
 
 	@$(call touch, $@)
 
diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make
index 4f9a12db5..9a439e207 100644
--- a/rules/e2fsprogs.make
+++ b/rules/e2fsprogs.make
@@ -119,28 +119,28 @@ e2fsprogs_targetinstall: $(STATEDIR)/e2fsprogs.targetinstall
 $(STATEDIR)/e2fsprogs.targetinstall: $(e2fsprogs_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,e2fsprogs)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(E2FSPROGS_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, e2fsprogs)
+	@$(call install_fixup, e2fsprogs,PACKAGE,e2fsprogs)
+	@$(call install_fixup, e2fsprogs,PRIORITY,optional)
+	@$(call install_fixup, e2fsprogs,VERSION,$(E2FSPROGS_VERSION))
+	@$(call install_fixup, e2fsprogs,SECTION,base)
+	@$(call install_fixup, e2fsprogs,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, e2fsprogs,DEPENDS,)
+	@$(call install_fixup, e2fsprogs,DESCRIPTION,missing)
 
 ifdef PTXCONF_E2FSPROGS_MKFS
-	@$(call install_copy, 0, 0, 0755, $(E2FSPROGS_BUILD_DIR)/misc/mke2fs, /sbin/mke2fs)
+	@$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_BUILD_DIR)/misc/mke2fs, /sbin/mke2fs)
 endif
 ifdef PTXCONF_E2FSPROGS_E2FSCK
-	@$(call install_copy, 0, 0, 0755, $(E2FSPROGS_BUILD_DIR)/e2fsck/e2fsck.shared, /sbin/e2fsck)
+	@$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_BUILD_DIR)/e2fsck/e2fsck.shared, /sbin/e2fsck)
 endif
 ifdef PTXCONF_E2FSPROGS_TUNE2FS
-	@$(call install_copy, 0, 0, 0755, $(E2FSPROGS_BUILD_DIR)/misc/tune2fs, /sbin/tune2fs)
-	@$(call install_link, /sbin/tune2fs, /sbin/findfs)
-	@$(call install_link, /sbin/tune2fs, /sbin/e2label)
+	@$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_BUILD_DIR)/misc/tune2fs, /sbin/tune2fs)
+	@$(call install_link, e2fsprogs, /sbin/tune2fs, /sbin/findfs)
+	@$(call install_link, e2fsprogs, /sbin/tune2fs, /sbin/e2label)
 endif
 
-	@$(call install_finish)
+	@$(call install_finish, e2fsprogs)
 
 	@$(call touch, $@)
 
diff --git a/rules/efax.make b/rules/efax.make
index de4e8ac54..2f682951e 100644
--- a/rules/efax.make
+++ b/rules/efax.make
@@ -104,19 +104,19 @@ efax_targetinstall: $(STATEDIR)/efax.targetinstall
 $(STATEDIR)/efax.targetinstall: $(efax_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,efax)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(EFAX_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(EFAX_DIR)/efax, /usr/bin/efax)
-	@$(call install_copy, 0, 0, 0755, $(EFAX_DIR)/efix, /usr/bin/efix)
-
-	@$(call install_finish)
+	@$(call install_init, efax)
+	@$(call install_fixup, efax,PACKAGE,efax)
+	@$(call install_fixup, efax,PRIORITY,optional)
+	@$(call install_fixup, efax,VERSION,$(EFAX_VERSION))
+	@$(call install_fixup, efax,SECTION,base)
+	@$(call install_fixup, efax,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, efax,DEPENDS,)
+	@$(call install_fixup, efax,DESCRIPTION,missing)
+
+	@$(call install_copy, efax, 0, 0, 0755, $(EFAX_DIR)/efax, /usr/bin/efax)
+	@$(call install_copy, efax, 0, 0, 0755, $(EFAX_DIR)/efix, /usr/bin/efix)
+
+	@$(call install_finish, efax)
 
 	@$(call touch, $@)
 
diff --git a/rules/etherwake.make b/rules/etherwake.make
index fc924c1fb..1173c2657 100644
--- a/rules/etherwake.make
+++ b/rules/etherwake.make
@@ -101,18 +101,18 @@ etherwake_targetinstall: $(STATEDIR)/etherwake.targetinstall
 $(STATEDIR)/etherwake.targetinstall: $(etherwake_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 	
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,etherwake)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(ETHERWAKE_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, etherwake)
+	@$(call install_fixup, etherwake,PACKAGE,etherwake)
+	@$(call install_fixup, etherwake,PRIORITY,optional)
+	@$(call install_fixup, etherwake,VERSION,$(ETHERWAKE_VERSION))
+	@$(call install_fixup, etherwake,SECTION,base)
+	@$(call install_fixup, etherwake,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, etherwake,DEPENDS,)
+	@$(call install_fixup, etherwake,DESCRIPTION,missing)
 	
-	@$(call install_copy, 0, 0, 0755, $(ETHERWAKE_DIR)/etherwake, /usr/sbin/etherwake)
+	@$(call install_copy, etherwake, 0, 0, 0755, $(ETHERWAKE_DIR)/etherwake, /usr/sbin/etherwake)
 
-	@$(call install_finish)
+	@$(call install_finish, etherwake)
 
 	@$(call touch, $@)
 
diff --git a/rules/expat.make b/rules/expat.make
index 8c7e34863..6ea768fa0 100644
--- a/rules/expat.make
+++ b/rules/expat.make
@@ -108,20 +108,20 @@ expat_targetinstall: $(STATEDIR)/expat.targetinstall
 $(STATEDIR)/expat.targetinstall: $(expat_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,expat)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(EXPAT_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, $(EXPAT_DIR)/.libs/libexpat.so.0.5.0, /lib/libexpat.so.0.5.0)
-	@$(call install_link, libexpat.so.0.5.0, /lib/libexpat.so.0)
-	@$(call install_link, libexpat.so.0.5.0, /lib/libexpat.so)
-
-	@$(call install_finish)
+	@$(call install_init, expat)
+	@$(call install_fixup, expat,PACKAGE,expat)
+	@$(call install_fixup, expat,PRIORITY,optional)
+	@$(call install_fixup, expat,VERSION,$(EXPAT_VERSION))
+	@$(call install_fixup, expat,SECTION,base)
+	@$(call install_fixup, expat,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, expat,DEPENDS,)
+	@$(call install_fixup, expat,DESCRIPTION,missing)
+
+	@$(call install_copy, expat, 0, 0, 0644, $(EXPAT_DIR)/.libs/libexpat.so.0.5.0, /lib/libexpat.so.0.5.0)
+	@$(call install_link, expat, libexpat.so.0.5.0, /lib/libexpat.so.0)
+	@$(call install_link, expat, libexpat.so.0.5.0, /lib/libexpat.so)
+
+	@$(call install_finish, expat)
 
 	@$(call touch, $@)
 
diff --git a/rules/fbtest.make b/rules/fbtest.make
index fb32a2916..65e54194b 100644
--- a/rules/fbtest.make
+++ b/rules/fbtest.make
@@ -98,18 +98,18 @@ fbtest_targetinstall: $(STATEDIR)/fbtest.targetinstall
 $(STATEDIR)/fbtest.targetinstall: $(fbtest_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,fbtest)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(FBTEST_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, fbtest)
+	@$(call install_fixup, fbtest,PACKAGE,fbtest)
+	@$(call install_fixup, fbtest,PRIORITY,optional)
+	@$(call install_fixup, fbtest,VERSION,$(FBTEST_VERSION))
+	@$(call install_fixup, fbtest,SECTION,base)
+	@$(call install_fixup, fbtest,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, fbtest,DEPENDS,)
+	@$(call install_fixup, fbtest,DESCRIPTION,missing)
 	
-	@$(call install_copy, 0, 0, 0755, $(FBTEST_DIR)/$(COMPILER_PREFIX)fbtest, /sbin/fbtest)
+	@$(call install_copy, fbtest, 0, 0, 0755, $(FBTEST_DIR)/$(COMPILER_PREFIX)fbtest, /sbin/fbtest)
 
-	@$(call install_finish)
+	@$(call install_finish, fbtest)
 
 	@$(call touch, $@)
 
diff --git a/rules/fbutils.make b/rules/fbutils.make
index bdb41ddd6..242c54b1e 100644
--- a/rules/fbutils.make
+++ b/rules/fbutils.make
@@ -97,31 +97,31 @@ fbutils_targetinstall: $(STATEDIR)/fbutils.targetinstall
 $(STATEDIR)/fbutils.targetinstall: $(fbutils_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,fbutils)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(FBUTILS_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, fbutils)
+	@$(call install_fixup, fbutils,PACKAGE,fbutils)
+	@$(call install_fixup, fbutils,PRIORITY,optional)
+	@$(call install_fixup, fbutils,VERSION,$(FBUTILS_VERSION))
+	@$(call install_fixup, fbutils,SECTION,base)
+	@$(call install_fixup, fbutils,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, fbutils,DEPENDS,)
+	@$(call install_fixup, fbutils,DESCRIPTION,missing)
 
 ifdef PTXCONF_FBUTILS_FBSET
-	@$(call install_copy, 0, 0, 0755, $(FBUTILS_DIR)/fbset/fbset, /sbin/fbset)
+	@$(call install_copy, fbutils, 0, 0, 0755, $(FBUTILS_DIR)/fbset/fbset, /sbin/fbset)
 endif
 ifdef PTXCONF_FBUTILS_FBCMAP
-	@$(call install_copy, 0, 0, 0755, $(FBUTILS_DIR)/fbcmap/fbcmap, /sbin/fbcmap)
+	@$(call install_copy, fbutils, 0, 0, 0755, $(FBUTILS_DIR)/fbcmap/fbcmap, /sbin/fbcmap)
 endif
 ifdef PTXCONF_FBUTILS_FBCONVERT
-	@$(call install_copy, 0, 0, 0755, $(FBUTILS_DIR)/fbconvert/fbconvert, /sbin/fbconvert)
+	@$(call install_copy, fbutils, 0, 0, 0755, $(FBUTILS_DIR)/fbconvert/fbconvert, /sbin/fbconvert)
 endif
 ifdef PTXCONF_FBUTILS_FBCONVERT
-	@$(call install_copy, 0, 0, 0755, $(FBUTILS_DIR)/fbconvert/fbconvert, /sbin/fbconvert)
+	@$(call install_copy, fbutils, 0, 0, 0755, $(FBUTILS_DIR)/fbconvert/fbconvert, /sbin/fbconvert)
 endif
 ifdef PTXCONF_FBUTILS_CON2FBMAP
-	@$(call install_copy, 0, 0, 0755, $(FBUTILS_DIR)/con2fbmap/con2fbmap, /sbin/con2fbmap)
+	@$(call install_copy, fbutils, 0, 0, 0755, $(FBUTILS_DIR)/con2fbmap/con2fbmap, /sbin/con2fbmap)
 endif
-	@$(call install_finish)
+	@$(call install_finish, fbutils)
 
 	@$(call touch, $@)
 
diff --git a/rules/figlet.make b/rules/figlet.make
index d240ccbf6..551f867b8 100644
--- a/rules/figlet.make
+++ b/rules/figlet.make
@@ -102,19 +102,19 @@ $(STATEDIR)/figlet.targetinstall: $(figlet_targetinstall_deps_default)
 
 	rm -f $(ROOTDIR)/usr/sbin/figlet $(ROOTDIR)/usr/share/figlet/*
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,figlet)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(FIGLET_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(FIGLET_DIR)/figlet, /usr/sbin/figlet)
-	@$(call install_copy, 0, 0, 0644, $(FIGLET_DIR)/fonts/standard.flf, /usr/share/figlet/standard.flf, n)
-
-	@$(call install_finish)
+	@$(call install_init, figlet)
+	@$(call install_fixup, figlet,PACKAGE,figlet)
+	@$(call install_fixup, figlet,PRIORITY,optional)
+	@$(call install_fixup, figlet,VERSION,$(FIGLET_VERSION))
+	@$(call install_fixup, figlet,SECTION,base)
+	@$(call install_fixup, figlet,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, figlet,DEPENDS,)
+	@$(call install_fixup, figlet,DESCRIPTION,missing)
+
+	@$(call install_copy, figlet, 0, 0, 0755, $(FIGLET_DIR)/figlet, /usr/sbin/figlet)
+	@$(call install_copy, figlet, 0, 0, 0644, $(FIGLET_DIR)/fonts/standard.flf, /usr/share/figlet/standard.flf, n)
+
+	@$(call install_finish, figlet)
 
 	@$(call touch, $@)
 
diff --git a/rules/flash.make b/rules/flash.make
index e1eec38c2..91919090c 100644
--- a/rules/flash.make
+++ b/rules/flash.make
@@ -123,23 +123,23 @@ flash_targetinstall: $(STATEDIR)/flash.targetinstall
 $(STATEDIR)/flash.targetinstall: $(flash_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 	
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,flash)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(FLASH_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, flash)
+	@$(call install_fixup, flash,PACKAGE,flash)
+	@$(call install_fixup, flash,PRIORITY,optional)
+	@$(call install_fixup, flash,VERSION,$(FLASH_VERSION))
+	@$(call install_fixup, flash,SECTION,base)
+	@$(call install_fixup, flash,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, flash,DEPENDS,)
+	@$(call install_fixup, flash,DESCRIPTION,missing)
 
-	@$(call install_copy, 0, 0, 0755, $(FLASH_DIR)/flash, /usr/bin/flash)
+	@$(call install_copy, flash, 0, 0, 0755, $(FLASH_DIR)/flash, /usr/bin/flash)
 
 	# FIMXE: RSC: permissions? 
-	@$(call install_copy, 0, 0, 0755, $(FLASH_DIR)/modules/alarms, /usr/lib/flash/alarms)
-	@$(call install_copy, 0, 0, 0755, $(FLASH_DIR)/modules/background, /usr/lib/flash/background)
-	@$(call install_copy, 0, 0, 0755, $(FLASH_DIR)/modules/countdown, /usr/lib/flash/countdown)
+	@$(call install_copy, flash, 0, 0, 0755, $(FLASH_DIR)/modules/alarms, /usr/lib/flash/alarms)
+	@$(call install_copy, flash, 0, 0, 0755, $(FLASH_DIR)/modules/background, /usr/lib/flash/background)
+	@$(call install_copy, flash, 0, 0, 0755, $(FLASH_DIR)/modules/countdown, /usr/lib/flash/countdown)
 
-	@$(call install_finish)
+	@$(call install_finish, flash)
 
 	@$(call touch, $@)
 # ----------------------------------------------------------------------------
diff --git a/rules/fltk.make b/rules/fltk.make
index d85c6a72e..93abb6d79 100644
--- a/rules/fltk.make
+++ b/rules/fltk.make
@@ -133,29 +133,29 @@ fltk_targetinstall: $(STATEDIR)/fltk.targetinstall
 $(STATEDIR)/fltk.targetinstall: $(fltk_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,fltk)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(FLTK_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_init, fltk)
+	@$(call install_fixup, fltk,PACKAGE,fltk)
+	@$(call install_fixup, fltk,PRIORITY,optional)
+	@$(call install_fixup, fltk,VERSION,$(FLTK_VERSION))
+	@$(call install_fixup, fltk,SECTION,base)
+	@$(call install_fixup, fltk,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, fltk,DEPENDS,)
+	@$(call install_fixup, fltk,DESCRIPTION,missing)
+
+	@$(call install_copy, fltk, 0, 0, 0644, \
 		$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib/libfltk.so.1.1, \
 		/usr/lib/libfltk.so.1.1)
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, fltk, 0, 0, 0644, \
 		$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib/libfltk_forms.so.1.1, \
 		/usr/lib/libfltk_forms.so.1.1)
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, fltk, 0, 0, 0644, \
 		$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib/libfltk_images.so.1.1, \
 		/usr/lib/libfltk_images.so.1.1)
-	@$(call install_link, libfltk.so.1.1, /usr/lib/libfltk.so)
-	@$(call install_link, libfltk_forms.so.1.1, /usr/lib/libfltk_forms.so)
-	@$(call install_link, libfltk_images.so.1.1, /usr/lib/libfltk_images.so)
+	@$(call install_link, fltk, libfltk.so.1.1, /usr/lib/libfltk.so)
+	@$(call install_link, fltk, libfltk_forms.so.1.1, /usr/lib/libfltk_forms.so)
+	@$(call install_link, fltk, libfltk_images.so.1.1, /usr/lib/libfltk_images.so)
 	
-	@$(call install_finish)
+	@$(call install_finish, fltk)
 
 	@$(call touch, $@)
 
diff --git a/rules/fontconfig22.make b/rules/fontconfig22.make
index 640eb37e4..cf58a24c3 100644
--- a/rules/fontconfig22.make
+++ b/rules/fontconfig22.make
@@ -118,22 +118,22 @@ fontconfig22_targetinstall: $(STATEDIR)/fontconfig22.targetinstall
 $(STATEDIR)/fontconfig22.targetinstall: $(fontconfig22_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,fontconfig22)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(FONTCONFIG22_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_init, fontconfig22)
+	@$(call install_fixup, fontconfig22,PACKAGE,fontconfig22)
+	@$(call install_fixup, fontconfig22,PRIORITY,optional)
+	@$(call install_fixup, fontconfig22,VERSION,$(FONTCONFIG22_VERSION))
+	@$(call install_fixup, fontconfig22,SECTION,base)
+	@$(call install_fixup, fontconfig22,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, fontconfig22,DEPENDS,)
+	@$(call install_fixup, fontconfig22,DESCRIPTION,missing)
+
+	@$(call install_copy, fontconfig22, 0, 0, 0644, \
 		$(FONTCONFIG22_DIR)/src/.libs/libfontconfig.so.1.0.4, \
 		/usr/lib/libfontconfig.so.1.0.4)
-	@$(call install_link, libfontconfig.so.1.0.4, /usr/lib/libfontconfig.so.1)
-	@$(call install_link, libfontconfig.so.1.0.4, /usr/lib/libfontconfig.so)
+	@$(call install_link, fontconfig22, libfontconfig.so.1.0.4, /usr/lib/libfontconfig.so.1)
+	@$(call install_link, fontconfig22, libfontconfig.so.1.0.4, /usr/lib/libfontconfig.so)
 
-	@$(call install_finish)
+	@$(call install_finish, fontconfig22)
 
 	@$(call touch, $@)
 
diff --git a/rules/freetype.make b/rules/freetype.make
index d4a6be72a..d80883fe3 100644
--- a/rules/freetype.make
+++ b/rules/freetype.make
@@ -108,22 +108,22 @@ freetype_targetinstall: $(STATEDIR)/freetype.targetinstall
 $(STATEDIR)/freetype.targetinstall: $(freetype_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,freetype)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(FREETYPE_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, freetype)
+	@$(call install_fixup, freetype,PACKAGE,freetype)
+	@$(call install_fixup, freetype,PRIORITY,optional)
+	@$(call install_fixup, freetype,VERSION,$(FREETYPE_VERSION))
+	@$(call install_fixup, freetype,SECTION,base)
+	@$(call install_fixup, freetype,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, freetype,DEPENDS,)
+	@$(call install_fixup, freetype,DESCRIPTION,missing)
 	
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, freetype, 0, 0, 0644, \
 		$(FREETYPE_DIR)/objs/.libs/libfreetype.so.6.3.7, \
 		/usr/lib/libfreetype.so.6.3.7)
-	@$(call install_link, libfreetype.so.6.3.7, /usr/lib/libfreetype.so.6)		
-	@$(call install_link, libfreetype.so.6.3.7, /usr/lib/libfreetype.so)		
+	@$(call install_link, freetype, libfreetype.so.6.3.7, /usr/lib/libfreetype.so.6)		
+	@$(call install_link, freetype, libfreetype.so.6.3.7, /usr/lib/libfreetype.so)		
 
-	@$(call install_finish)
+	@$(call install_finish, freetype)
 
 	@$(call touch, $@)
 
diff --git a/rules/gail.make b/rules/gail.make
index 5ee0e15eb..0486d088b 100644
--- a/rules/gail.make
+++ b/rules/gail.make
@@ -106,22 +106,22 @@ gail_targetinstall: $(STATEDIR)/gail.targetinstall
 $(STATEDIR)/gail.targetinstall: $(gail_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,gail)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(GAIL_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, $(GAIL_DIR)/gail/.libs/libgail.so, /usr/lib/libgail.so)
-	@$(call install_copy, 0, 0, 0644, $(GAIL_DIR)/libgail-util/.libs/libgailutil.so.17.0.0, /usr/lib/libgailutil.so.17.0.0)
-	@$(call install_link, libgailutil.so.17.0.0, /usr/lib/libgailutil.so.17.0)
-	@$(call install_link, libgailutil.so.17.0.0, /usr/lib/libgailutil.so.17)
-	@$(call install_link, libgailutil.so.17.0.0, /usr/lib/libgailutil.so)
-
-	@$(call install_finish)
+	@$(call install_init, gail)
+	@$(call install_fixup, gail,PACKAGE,gail)
+	@$(call install_fixup, gail,PRIORITY,optional)
+	@$(call install_fixup, gail,VERSION,$(GAIL_VERSION))
+	@$(call install_fixup, gail,SECTION,base)
+	@$(call install_fixup, gail,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, gail,DEPENDS,)
+	@$(call install_fixup, gail,DESCRIPTION,missing)
+
+	@$(call install_copy, gail, 0, 0, 0644, $(GAIL_DIR)/gail/.libs/libgail.so, /usr/lib/libgail.so)
+	@$(call install_copy, gail, 0, 0, 0644, $(GAIL_DIR)/libgail-util/.libs/libgailutil.so.17.0.0, /usr/lib/libgailutil.so.17.0.0)
+	@$(call install_link, gail, libgailutil.so.17.0.0, /usr/lib/libgailutil.so.17.0)
+	@$(call install_link, gail, libgailutil.so.17.0.0, /usr/lib/libgailutil.so.17)
+	@$(call install_link, gail, libgailutil.so.17.0.0, /usr/lib/libgailutil.so)
+
+	@$(call install_finish, gail)
 
 	@$(call touch, $@)
 
diff --git a/rules/gcclibs.make b/rules/gcclibs.make
index 7c5440cee..33439303f 100644
--- a/rules/gcclibs.make
+++ b/rules/gcclibs.make
@@ -77,28 +77,28 @@ gcclibs_targetinstall: $(STATEDIR)/gcclibs.targetinstall
 $(STATEDIR)/gcclibs.targetinstall: $(gcclibs_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,gcclibs)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(shell $(CROSS_CC) -dumpversion))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, gcclibs)
+	@$(call install_fixup, gcclibs,PACKAGE,gcclibs)
+	@$(call install_fixup, gcclibs,PRIORITY,optional)
+	@$(call install_fixup, gcclibs,VERSION,$(shell $(CROSS_CC) -dumpversion))
+	@$(call install_fixup, gcclibs,SECTION,base)
+	@$(call install_fixup, gcclibs,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, gcclibs,DEPENDS,)
+	@$(call install_fixup, gcclibs,DESCRIPTION,missing)
 
 ifdef PTXCONF_GCCLIBS_CXX
-	@$(call install_copy_toolchain_lib, libstdc++.so, /usr/lib)
+	@$(call install_copy_toolchain_lib, gcclibs, libstdc++.so, /usr/lib)
 endif
 
 ifdef PTXCONF_GCCLIBS_GCC_S
-	@$(call install_copy_toolchain_lib, libgcc_s.so, /lib)
+	@$(call install_copy_toolchain_lib, gcclibs, libgcc_s.so, /lib)
 endif
 
 ifdef PTXCONF_GCCLIBS_GCC_S_NOF
-	@$(call install_copy_toolchain_lib, libgcc_s_nof.so, /lib)
+	@$(call install_copy_toolchain_lib, gcclibs, libgcc_s_nof.so, /lib)
 endif
 
-	@$(call install_finish)
+	@$(call install_finish, gcclibs)
 
 	@$(call touch, $@)
 
diff --git a/rules/gdb.make b/rules/gdb.make
index a414865c1..749c9fb75 100644
--- a/rules/gdb.make
+++ b/rules/gdb.make
@@ -131,18 +131,18 @@ $(STATEDIR)/gdb.targetinstall: $(gdb_targetinstall_deps_default)
 
 	mkdir -p $(ROOTDIR)/usr/bin
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,gdb)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(GDB_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(GDB_BUILDDIR)/gdb/gdb, /usr/bin/gdb)
-
-	@$(call install_finish)
+	@$(call install_init, gdb)
+	@$(call install_fixup, gdb,PACKAGE,gdb)
+	@$(call install_fixup, gdb,PRIORITY,optional)
+	@$(call install_fixup, gdb,VERSION,$(GDB_VERSION))
+	@$(call install_fixup, gdb,SECTION,base)
+	@$(call install_fixup, gdb,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, gdb,DEPENDS,)
+	@$(call install_fixup, gdb,DESCRIPTION,missing)
+
+	@$(call install_copy, gdb, 0, 0, 0755, $(GDB_BUILDDIR)/gdb/gdb, /usr/bin/gdb)
+
+	@$(call install_finish, gdb)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/gdbserver.make b/rules/gdbserver.make
index b52dcf81e..d4e2dc995 100644
--- a/rules/gdbserver.make
+++ b/rules/gdbserver.make
@@ -106,18 +106,18 @@ gdbserver_targetinstall: $(STATEDIR)/gdbserver.targetinstall
 $(STATEDIR)/gdbserver.targetinstall: $(gdbserver_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,gdbserver)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(GDB_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(GDBSERVER_BUILDDIR)/gdbserver, /usr/bin/gdbserver)
-
-	@$(call install_finish)
+	@$(call install_init, gdbserver)
+	@$(call install_fixup, gdbserver,PACKAGE,gdbserver)
+	@$(call install_fixup, gdbserver,PRIORITY,optional)
+	@$(call install_fixup, gdbserver,VERSION,$(GDB_VERSION))
+	@$(call install_fixup, gdbserver,SECTION,base)
+	@$(call install_fixup, gdbserver,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, gdbserver,DEPENDS,)
+	@$(call install_fixup, gdbserver,DESCRIPTION,missing)
+
+	@$(call install_copy, gdbserver, 0, 0, 0755, $(GDBSERVER_BUILDDIR)/gdbserver, /usr/bin/gdbserver)
+
+	@$(call install_finish, gdbserver)
 
 	@$(call touch, $@)
 
diff --git a/rules/gettext.make b/rules/gettext.make
index a3d170f9a..7b9397181 100644
--- a/rules/gettext.make
+++ b/rules/gettext.make
@@ -124,25 +124,25 @@ gettext_targetinstall: $(STATEDIR)/gettext.targetinstall
 $(STATEDIR)/gettext.targetinstall: $(gettext_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,gettext)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(GETTEXT_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, gettext)
+	@$(call install_fixup, gettext,PACKAGE,gettext)
+	@$(call install_fixup, gettext,PRIORITY,optional)
+	@$(call install_fixup, gettext,VERSION,$(GETTEXT_VERSION))
+	@$(call install_fixup, gettext,SECTION,base)
+	@$(call install_fixup, gettext,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, gettext,DEPENDS,)
+	@$(call install_fixup, gettext,DESCRIPTION,missing)
 	
 	cd $(GETTEXT_DIR)/gettext-runtime/intl/.libs && \
 		for file in `find . -type f -name 'lib*intl.so*'`; do \
-			$(call install_copy, 0, 0, 0644, $$file, /usr/lib/$$file, n) \
+			$(call install_copy, gettext, 0, 0, 0644, $$file, /usr/lib/$$file, n) \
 		done
 	cd $(GETTEXT_DIR)/gettext-runtime/intl/.libs && \
 		for file in `find . -type l -name 'lib*intl.so*'`; do \
-			$(call install_link, `readlink $$file`, /usr/lib/$$file) \
+			$(call install_link, gettext, `readlink $$file`, /usr/lib/$$file) \
 		done
 
-	@$(call install_finish)
+	@$(call install_finish, gettext)
 
 	@$(call touch, $@)
 
diff --git a/rules/glib12.make b/rules/glib12.make
index 521cc1deb..58d6ba7ca 100644
--- a/rules/glib12.make
+++ b/rules/glib12.make
@@ -118,31 +118,31 @@ glib12_targetinstall: $(STATEDIR)/glib12.targetinstall
 $(STATEDIR)/glib12.targetinstall: $(glib12_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,glib12)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(GLIB12_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, glib12)
+	@$(call install_fixup, glib12,PACKAGE,glib12)
+	@$(call install_fixup, glib12,PRIORITY,optional)
+	@$(call install_fixup, glib12,VERSION,$(GLIB12_VERSION))
+	@$(call install_fixup, glib12,SECTION,base)
+	@$(call install_fixup, glib12,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, glib12,DEPENDS,)
+	@$(call install_fixup, glib12,DESCRIPTION,missing)
 
 	# glib
-	@$(call install_copy, 0, 0, 0644, $(GLIB12_DIR)/.libs/libglib-1.2.so.0.0.10, /usr/lib/libglib-1.2.so.0.0.10)
-	@$(call install_link, libglib-1.2.so.0.0.10, /usr/lib/libglib-1.2.so.0)
-	@$(call install_link, libglib-1.2.so.0.0.10, /usr/lib/libglib-1.2.so)
+	@$(call install_copy, glib12, 0, 0, 0644, $(GLIB12_DIR)/.libs/libglib-1.2.so.0.0.10, /usr/lib/libglib-1.2.so.0.0.10)
+	@$(call install_link, glib12, libglib-1.2.so.0.0.10, /usr/lib/libglib-1.2.so.0)
+	@$(call install_link, glib12, libglib-1.2.so.0.0.10, /usr/lib/libglib-1.2.so)
 
 	# gmodule
-	@$(call install_copy, 0, 0, 0644, $(GLIB12_DIR)/gmodule/.libs/libgmodule-1.2.so.0.0.10, /usr/lib/libgmodule-1.2.so.0.0.10)
-	@$(call install_link, libgmodule-1.2.so.0.0.10, /usr/lib/libgmodule-1.2.so.0)
-	@$(call install_link, libgmodule-1.2.so.0.0.10, /usr/lib/libgmodule-1.2.so)
+	@$(call install_copy, glib12, 0, 0, 0644, $(GLIB12_DIR)/gmodule/.libs/libgmodule-1.2.so.0.0.10, /usr/lib/libgmodule-1.2.so.0.0.10)
+	@$(call install_link, glib12, libgmodule-1.2.so.0.0.10, /usr/lib/libgmodule-1.2.so.0)
+	@$(call install_link, glib12, libgmodule-1.2.so.0.0.10, /usr/lib/libgmodule-1.2.so)
 
 	# gthread
-	@$(call install_copy, 0, 0, 0644, $(GLIB12_DIR)/gthread/.libs/libgthread-1.2.so.0.0.10, /usr/lib/libgthread-1.2.so.0.0.10)
-	@$(call install_link, libgthread-1.2.so.0.0.10 /usr/lib/libgthread-1.2.so.0)
-	@$(call install_link, libgthread-1.2.so.0.0.10 /usr/lib/libgthread-1.2.so)
+	@$(call install_copy, glib12, 0, 0, 0644, $(GLIB12_DIR)/gthread/.libs/libgthread-1.2.so.0.0.10, /usr/lib/libgthread-1.2.so.0.0.10)
+	@$(call install_link, glib12, libgthread-1.2.so.0.0.10 /usr/lib/libgthread-1.2.so.0)
+	@$(call install_link, glib12, libgthread-1.2.so.0.0.10 /usr/lib/libgthread-1.2.so)
 
-	@$(call install_finish)
+	@$(call install_finish, glib12)
 
 	@$(call touch, $@)
 
diff --git a/rules/glib22.make b/rules/glib22.make
index c3a6b37c9..0f18912ff 100644
--- a/rules/glib22.make
+++ b/rules/glib22.make
@@ -117,40 +117,40 @@ glib22_targetinstall: $(STATEDIR)/glib22.targetinstall
 $(STATEDIR)/glib22.targetinstall: $(glib22_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,glib22)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(GLIB22_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_init, glib22)
+	@$(call install_fixup, glib22,PACKAGE,glib22)
+	@$(call install_fixup, glib22,PRIORITY,optional)
+	@$(call install_fixup, glib22,VERSION,$(GLIB22_VERSION))
+	@$(call install_fixup, glib22,SECTION,base)
+	@$(call install_fixup, glib22,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, glib22,DEPENDS,)
+	@$(call install_fixup, glib22,DESCRIPTION,missing)
+
+	@$(call install_copy, glib22, 0, 0, 0644, \
 		$(GLIB22_DIR)/glib/.libs/libglib-2.0.so.0.302.0, \
 		/usr/lib/libglib-2.0.so.0.302.0)
-	@$(call install_link, libglib-2.0.so.0.302.0, /usr/lib/libglib-2.0.so.0)
-	@$(call install_link, libglib-2.0.so.0.302.0, /usr/lib/libglib-2.0.so)
+	@$(call install_link, glib22, libglib-2.0.so.0.302.0, /usr/lib/libglib-2.0.so.0)
+	@$(call install_link, glib22, libglib-2.0.so.0.302.0, /usr/lib/libglib-2.0.so)
 
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, glib22, 0, 0, 0644, \
 		$(GLIB22_DIR)/gobject/.libs/libgobject-2.0.so.0.302.0, \
 		/usr/lib/libgobject-2.0.so.0.302.0)
-	@$(call install_link, libgobject-2.0.so.0.302.0, /usr/lib/libgobject-2.0.so.0)
-	@$(call install_link, libgobject-2.0.so.0.302.0, /usr/lib/libgobject-2.0.so)
+	@$(call install_link, glib22, libgobject-2.0.so.0.302.0, /usr/lib/libgobject-2.0.so.0)
+	@$(call install_link, glib22, libgobject-2.0.so.0.302.0, /usr/lib/libgobject-2.0.so)
 
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, glib22, 0, 0, 0644, \
 		$(GLIB22_DIR)/gmodule/.libs/libgmodule-2.0.so.0.302.0, \
 		/usr/lib/libgmodule-2.0.so.0.302.0)
-	@$(call install_link, libgmodule-2.0.so.0.302.0, /usr/lib/libgmodule-2.0.so.0)
-	@$(call install_link, libgmodule-2.0.so.0.302.0, /usr/lib/libgmodule-2.0.so)
+	@$(call install_link, glib22, libgmodule-2.0.so.0.302.0, /usr/lib/libgmodule-2.0.so.0)
+	@$(call install_link, glib22, libgmodule-2.0.so.0.302.0, /usr/lib/libgmodule-2.0.so)
 
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, glib22, 0, 0, 0644, \
 		$(GLIB22_DIR)/gthread/.libs/libgthread-2.0.so.0.302.0, \
 		/usr/lib/libgthread-2.0.so.0.302.0)
-	@$(call install_link, libgthread-2.0.so.0.302.0, /usr/lib/libgthread-2.0.so.0)
-	@$(call install_link, libgthread-2.0.so.0.302.0, /usr/lib/libgthread-2.0.so)
+	@$(call install_link, glib22, libgthread-2.0.so.0.302.0, /usr/lib/libgthread-2.0.so.0)
+	@$(call install_link, glib22, libgthread-2.0.so.0.302.0, /usr/lib/libgthread-2.0.so)
 
-	@$(call install_finish)
+	@$(call install_finish, glib22)
 
 	@$(call touch, $@)
 
diff --git a/rules/glib26.make b/rules/glib26.make
index cb3f555b2..eed92e235 100644
--- a/rules/glib26.make
+++ b/rules/glib26.make
@@ -118,32 +118,32 @@ glib26_targetinstall: $(STATEDIR)/glib26.targetinstall
 $(STATEDIR)/glib26.targetinstall: $(glib26_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,glib26)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(GLIB26_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, $(GLIB26_DIR)/glib/.libs/libglib-2.0.so.0.600.6, /usr/lib/libglib-2.0.so.0.600.6)
-	@$(call install_link, /usr/lib/libglib-2.0.so.0.600.6, /usr/lib/libglib-2.0.so.0)
-	@$(call install_link, /usr/lib/libglib-2.0.so.0.600.6, /usr/lib/libglib-2.0.so)
-
-	@$(call install_copy, 0, 0, 0644, $(GLIB26_DIR)/gobject/.libs/libgobject-2.0.so.0.600.6, /usr/lib/libgobject-2.0.so.0.600.6)
-	@$(call install_link, /usr/lib/libgobject-2.0.so.0.600.6, /usr/lib/libgobject-2.0.so.0)
-	@$(call install_link, /usr/lib/libgobject-2.0.so.0.600.6, /usr/lib/libgobject-2.0.so)
-
-	@$(call install_copy, 0, 0, 0644, $(GLIB26_DIR)/gmodule/.libs/libgmodule-2.0.so.0.600.6, /usr/lib/libgmodule-2.0.so.0.600.6)
-	@$(call install_link, /usr/lib/libgmodule-2.0.so.0.600.6, /usr/lib/libgmodule-2.0.so.0)
-	@$(call install_link, /usr/lib/libgmodule-2.0.so.0.600.6, /usr/lib/libgmodule-2.0.so)
-
-	@$(call install_copy, 0, 0, 0644, $(GLIB26_DIR)/gthread/.libs/libgthread-2.0.so.0.600.6, /usr/lib/libgthread-2.0.so.0.600.6)
-	@$(call install_link, /usr/lib/libgthread-2.0.so.0.600.6, /usr/lib/libgthread-2.0.so.0)
-	@$(call install_link, /usr/lib/libgthread-2.0.so.0.600.6, /usr/lib/libgthread-2.0.so)
-
-	@$(call install_finish)
+	@$(call install_init, glib26)
+	@$(call install_fixup, glib26,PACKAGE,glib26)
+	@$(call install_fixup, glib26,PRIORITY,optional)
+	@$(call install_fixup, glib26,VERSION,$(GLIB26_VERSION))
+	@$(call install_fixup, glib26,SECTION,base)
+	@$(call install_fixup, glib26,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, glib26,DEPENDS,)
+	@$(call install_fixup, glib26,DESCRIPTION,missing)
+
+	@$(call install_copy, glib26, 0, 0, 0644, $(GLIB26_DIR)/glib/.libs/libglib-2.0.so.0.600.6, /usr/lib/libglib-2.0.so.0.600.6)
+	@$(call install_link, glib26, /usr/lib/libglib-2.0.so.0.600.6, /usr/lib/libglib-2.0.so.0)
+	@$(call install_link, glib26, /usr/lib/libglib-2.0.so.0.600.6, /usr/lib/libglib-2.0.so)
+
+	@$(call install_copy, glib26, 0, 0, 0644, $(GLIB26_DIR)/gobject/.libs/libgobject-2.0.so.0.600.6, /usr/lib/libgobject-2.0.so.0.600.6)
+	@$(call install_link, glib26, /usr/lib/libgobject-2.0.so.0.600.6, /usr/lib/libgobject-2.0.so.0)
+	@$(call install_link, glib26, /usr/lib/libgobject-2.0.so.0.600.6, /usr/lib/libgobject-2.0.so)
+
+	@$(call install_copy, glib26, 0, 0, 0644, $(GLIB26_DIR)/gmodule/.libs/libgmodule-2.0.so.0.600.6, /usr/lib/libgmodule-2.0.so.0.600.6)
+	@$(call install_link, glib26, /usr/lib/libgmodule-2.0.so.0.600.6, /usr/lib/libgmodule-2.0.so.0)
+	@$(call install_link, glib26, /usr/lib/libgmodule-2.0.so.0.600.6, /usr/lib/libgmodule-2.0.so)
+
+	@$(call install_copy, glib26, 0, 0, 0644, $(GLIB26_DIR)/gthread/.libs/libgthread-2.0.so.0.600.6, /usr/lib/libgthread-2.0.so.0.600.6)
+	@$(call install_link, glib26, /usr/lib/libgthread-2.0.so.0.600.6, /usr/lib/libgthread-2.0.so.0)
+	@$(call install_link, glib26, /usr/lib/libgthread-2.0.so.0.600.6, /usr/lib/libgthread-2.0.so)
+
+	@$(call install_finish, glib26)
 
 	@$(call touch, $@)
 
diff --git a/rules/glib28.make b/rules/glib28.make
index cb8898147..39e5af772 100644
--- a/rules/glib28.make
+++ b/rules/glib28.make
@@ -119,32 +119,32 @@ glib28_targetinstall: $(STATEDIR)/glib28.targetinstall
 $(STATEDIR)/glib28.targetinstall: $(glib28_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,glib28)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(GLIB28_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, $(GLIB28_DIR)/glib/.libs/libglib-2.0.so.0.800.4, /usr/lib/libglib-2.0.so.0.800.4)
-	@$(call install_link, /usr/lib/libglib-2.0.so.0.800.4, /usr/lib/libglib-2.0.so.0)
-	@$(call install_link, /usr/lib/libglib-2.0.so.0.800.4, /usr/lib/libglib-2.0.so)
-
-	@$(call install_copy, 0, 0, 0644, $(GLIB28_DIR)/gobject/.libs/libgobject-2.0.so.0.800.4, /usr/lib/libgobject-2.0.so.0.800.4)
-	@$(call install_link, /usr/lib/libgobject-2.0.so.0.800.4, /usr/lib/libgobject-2.0.so.0)
-	@$(call install_link, /usr/lib/libgobject-2.0.so.0.800.4, /usr/lib/libgobject-2.0.so)
-
-	@$(call install_copy, 0, 0, 0644, $(GLIB28_DIR)/gmodule/.libs/libgmodule-2.0.so.0.800.4, /usr/lib/libgmodule-2.0.so.0.800.4)
-	@$(call install_link, /usr/lib/libgmodule-2.0.so.0.800.4, /usr/lib/libgmodule-2.0.so.0)
-	@$(call install_link, /usr/lib/libgmodule-2.0.so.0.800.4, /usr/lib/libgmodule-2.0.so)
-
-	@$(call install_copy, 0, 0, 0644, $(GLIB28_DIR)/gthread/.libs/libgthread-2.0.so.0.800.4, /usr/lib/libgthread-2.0.so.0.800.4)
-	@$(call install_link, /usr/lib/libgthread-2.0.so.0.800.4, /usr/lib/libgthread-2.0.so.0)
-	@$(call install_link, /usr/lib/libgthread-2.0.so.0.800.4, /usr/lib/libgthread-2.0.so)
-
-	@$(call install_finish)
+	@$(call install_init, glib28)
+	@$(call install_fixup, glib28,PACKAGE,glib28)
+	@$(call install_fixup, glib28,PRIORITY,optional)
+	@$(call install_fixup, glib28,VERSION,$(GLIB28_VERSION))
+	@$(call install_fixup, glib28,SECTION,base)
+	@$(call install_fixup, glib28,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, glib28,DEPENDS,)
+	@$(call install_fixup, glib28,DESCRIPTION,missing)
+
+	@$(call install_copy, glib28, 0, 0, 0644, $(GLIB28_DIR)/glib/.libs/libglib-2.0.so.0.800.4, /usr/lib/libglib-2.0.so.0.800.4)
+	@$(call install_link, glib28, /usr/lib/libglib-2.0.so.0.800.4, /usr/lib/libglib-2.0.so.0)
+	@$(call install_link, glib28, /usr/lib/libglib-2.0.so.0.800.4, /usr/lib/libglib-2.0.so)
+
+	@$(call install_copy, glib28, 0, 0, 0644, $(GLIB28_DIR)/gobject/.libs/libgobject-2.0.so.0.800.4, /usr/lib/libgobject-2.0.so.0.800.4)
+	@$(call install_link, glib28, /usr/lib/libgobject-2.0.so.0.800.4, /usr/lib/libgobject-2.0.so.0)
+	@$(call install_link, glib28, /usr/lib/libgobject-2.0.so.0.800.4, /usr/lib/libgobject-2.0.so)
+
+	@$(call install_copy, glib28, 0, 0, 0644, $(GLIB28_DIR)/gmodule/.libs/libgmodule-2.0.so.0.800.4, /usr/lib/libgmodule-2.0.so.0.800.4)
+	@$(call install_link, glib28, /usr/lib/libgmodule-2.0.so.0.800.4, /usr/lib/libgmodule-2.0.so.0)
+	@$(call install_link, glib28, /usr/lib/libgmodule-2.0.so.0.800.4, /usr/lib/libgmodule-2.0.so)
+
+	@$(call install_copy, glib28, 0, 0, 0644, $(GLIB28_DIR)/gthread/.libs/libgthread-2.0.so.0.800.4, /usr/lib/libgthread-2.0.so.0.800.4)
+	@$(call install_link, glib28, /usr/lib/libgthread-2.0.so.0.800.4, /usr/lib/libgthread-2.0.so.0)
+	@$(call install_link, glib28, /usr/lib/libgthread-2.0.so.0.800.4, /usr/lib/libgthread-2.0.so)
+
+	@$(call install_finish, glib28)
 
 	@$(call touch, $@)
 
diff --git a/rules/glibc.make b/rules/glibc.make
index 6c662db91..28878a37e 100644
--- a/rules/glibc.make
+++ b/rules/glibc.make
@@ -87,89 +87,89 @@ endif
 $(STATEDIR)/glibc.targetinstall: $(glibc_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,glibc)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(GLIBC_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, glibc)
+	@$(call install_fixup, glibc,PACKAGE,glibc)
+	@$(call install_fixup, glibc,PRIORITY,optional)
+	@$(call install_fixup, glibc,VERSION,$(GLIBC_VERSION))
+	@$(call install_fixup, glibc,SECTION,base)
+	@$(call install_fixup, glibc,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, glibc,DEPENDS,)
+	@$(call install_fixup, glibc,DESCRIPTION,missing)
 
 ifdef PTXCONF_GLIBC_INSTALL
-	@$(call install_copy_toolchain_dl, /lib, $(GLIBC_STRIP))
+	@$(call install_copy_toolchain_dl, glibc, /lib, $(GLIBC_STRIP))
 endif
 
 ifdef PTXCONF_GLIBC_LIBC
-	@$(call install_copy_toolchain_lib, libc.so.6, /lib, $(GLIBC_STRIP))
+	@$(call install_copy_toolchain_lib, glibc, libc.so.6, /lib, $(GLIBC_STRIP))
 endif
 
 ifdef PTXCONF_GLIBC_PTHREAD
-	@$(call install_copy_toolchain_lib, libpthread.so, /lib, $(GLIBC_STRIP))
+	@$(call install_copy_toolchain_lib, glibc, libpthread.so, /lib, $(GLIBC_STRIP))
 endif
 
 ifdef PTXCONF_GLIBC_THREAD_DB
-	@$(call install_copy_toolchain_lib, libthread_db.so, /lib, $(GLIBC_STRIP))
+	@$(call install_copy_toolchain_lib, glibc, libthread_db.so, /lib, $(GLIBC_STRIP))
 endif
 
 ifdef PTXCONF_GLIBC_LIBRT
-	@$(call install_copy_toolchain_lib, librt.so, /lib, $(GLIBC_STRIP))
+	@$(call install_copy_toolchain_lib, glibc, librt.so, /lib, $(GLIBC_STRIP))
 endif
 
 ifdef PTXCONF_GLIBC_DL
-	@$(call install_copy_toolchain_lib, libdl.so, /lib, $(GLIBC_STRIP))
+	@$(call install_copy_toolchain_lib, glibc, libdl.so, /lib, $(GLIBC_STRIP))
 endif
 
 ifdef PTXCONF_GLIBC_CRYPT
-	@$(call install_copy_toolchain_lib, libcrypt.so, /lib, $(GLIBC_STRIP))
+	@$(call install_copy_toolchain_lib, glibc, libcrypt.so, /lib, $(GLIBC_STRIP))
 endif
 
 ifdef PTXCONF_GLIBC_UTIL
-	@$(call install_copy_toolchain_lib, libutil.so, /lib, $(GLIBC_STRIP))
+	@$(call install_copy_toolchain_lib, glibc, libutil.so, /lib, $(GLIBC_STRIP))
 endif
 
 ifdef PTXCONF_GLIBC_LIBM
-	@$(call install_copy_toolchain_lib, libm.so, /lib, $(GLIBC_STRIP))
+	@$(call install_copy_toolchain_lib, glibc, libm.so, /lib, $(GLIBC_STRIP))
 endif
 
 ifdef PTXCONF_GLIBC_NSS_DNS
-	@$(call install_copy_toolchain_lib, libnss_dns.so, /lib, $(GLIBC_STRIP))
+	@$(call install_copy_toolchain_lib, glibc, libnss_dns.so, /lib, $(GLIBC_STRIP))
 endif
 
 ifdef PTXCONF_GLIBC_NSS_FILES
-	@$(call install_copy_toolchain_lib, libnss_files.so, /lib, $(GLIBC_STRIP))
+	@$(call install_copy_toolchain_lib, glibc, libnss_files.so, /lib, $(GLIBC_STRIP))
 endif
 
 ifdef PTXCONF_GLIBC_NSS_HESIOD
-	@$(call install_copy_toolchain_lib, libnss_hesiod.so, /lib, $(GLIBC_STRIP))
+	@$(call install_copy_toolchain_lib, glibc, libnss_hesiod.so, /lib, $(GLIBC_STRIP))
 endif
 
 ifdef PTXCONF_GLIBC_NSS_NIS
-	@$(call install_copy_toolchain_lib, libnss_nis.so, /lib, $(GLIBC_STRIP))
+	@$(call install_copy_toolchain_lib, glibc, libnss_nis.so, /lib, $(GLIBC_STRIP))
 endif
 
 ifdef PTXCONF_GLIBC_NSS_NISPLUS
-	@$(call install_copy_toolchain_lib, libnss_nisplus.so, /lib, $(GLIBC_STRIP))
+	@$(call install_copy_toolchain_lib, glibc, libnss_nisplus.so, /lib, $(GLIBC_STRIP))
 endif
 
 ifdef PTXCONF_GLIBC_NSS_COMPAT
-	@$(call install_copy_toolchain_lib, libnss_compat.so, /lib, $(GLIBC_STRIP))
+	@$(call install_copy_toolchain_lib, glibc, libnss_compat.so, /lib, $(GLIBC_STRIP))
 endif
 
 ifdef PTXCONF_GLIBC_RESOLV
-	@$(call install_copy_toolchain_lib, libresolv.so, /lib, $(GLIBC_STRIP))
+	@$(call install_copy_toolchain_lib, glibc, libresolv.so, /lib, $(GLIBC_STRIP))
 endif
 
 ifdef PTXCONF_GLIBC_NSL
-	@$(call install_copy_toolchain_lib, libnsl.so, /lib, $(GLIBC_STRIP))
+	@$(call install_copy_toolchain_lib, glibc, libnsl.so, /lib, $(GLIBC_STRIP))
 endif
 
 ifdef PTXCONF_GLIBC_GCONV
-	@$(call install_copy, 0, 0, 0755, /usr/lib/gconv)
+	@$(call install_copy, glibc, 0, 0, 0755, /usr/lib/gconv)
 endif
 
 ifdef PTXCONF_GLIBC_GCONV_ISO8859_1
-	@$(call install_copy_toolchain_lib, gconv/ISO8859-1.so, /lib, $(GLIBC_STRIP))
+	@$(call install_copy_toolchain_lib, glibc, gconv/ISO8859-1.so, /lib, $(GLIBC_STRIP))
 	echo "module INTERNAL ISO-8859-1// ISO8859-1 1" \
 		>> $(ROOTDIR)/usr/lib/gconv/gconv-modules
 	if [ "$(PTXCONF_IMAGE_IPKG)" != "" ]; then			\
@@ -179,12 +179,12 @@ ifdef PTXCONF_GLIBC_GCONV_ISO8859_1
 endif
 
 # Zonefiles
-	@$(call install_copy, 0, 0, 0755, /usr/share/zoneinfo)
+	@$(call install_copy, glibc, 0, 0, 0755, /usr/share/zoneinfo)
 	for target in $(GLIBC_ZONEFILES-y); do 				\
-		$(call install_copy, 0, 0, 0644, $(GLIBC_ZONEDIR)/zoneinfo/$$target, /usr/share/zoneinfo/$$target)	\
+		$(call install_copy, glibc, 0, 0, 0644, $(GLIBC_ZONEDIR)/zoneinfo/$$target, /usr/share/zoneinfo/$$target)	\
 	done;
 
-	@$(call install_finish)
+	@$(call install_finish, glibc)
 
 	@$(call touch, $@)
 
diff --git a/rules/gmp3.make b/rules/gmp3.make
index 06ed66165..24097522f 100644
--- a/rules/gmp3.make
+++ b/rules/gmp3.make
@@ -102,19 +102,19 @@ gmp3_targetinstall: $(STATEDIR)/gmp3.targetinstall
 $(STATEDIR)/gmp3.targetinstall: $(gmp3_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,gmp3)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(GMP3_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, gmp3)
+	@$(call install_fixup, gmp3,PACKAGE,gmp3)
+	@$(call install_fixup, gmp3,PRIORITY,optional)
+	@$(call install_fixup, gmp3,VERSION,$(GMP3_VERSION))
+	@$(call install_fixup, gmp3,SECTION,base)
+	@$(call install_fixup, gmp3,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, gmp3,DEPENDS,)
+	@$(call install_fixup, gmp3,DESCRIPTION,missing)
 
 	# FIXME: RSC: check if wildcard copy works
-	@$(call install_copy, 0, 0, 0644, $(CROSS_LIB_DIR)/lib/libgmp.so*, /usr/lib/)
+	@$(call install_copy, gmp3, 0, 0, 0644, $(CROSS_LIB_DIR)/lib/libgmp.so*, /usr/lib/)
 
-	@$(call install_finish)
+	@$(call install_finish, gmp3)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/gmp4.make b/rules/gmp4.make
index 961ca0fa2..957fff259 100644
--- a/rules/gmp4.make
+++ b/rules/gmp4.make
@@ -102,23 +102,23 @@ gmp4_targetinstall: $(STATEDIR)/gmp4.targetinstall
 $(STATEDIR)/gmp4.targetinstall: $(gmp4_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,gmp4)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(GMP4_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_init, gmp4)
+	@$(call install_fixup, gmp4,PACKAGE,gmp4)
+	@$(call install_fixup, gmp4,PRIORITY,optional)
+	@$(call install_fixup, gmp4,VERSION,$(GMP4_VERSION))
+	@$(call install_fixup, gmp4,SECTION,base)
+	@$(call install_fixup, gmp4,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, gmp4,DEPENDS,)
+	@$(call install_fixup, gmp4,DESCRIPTION,missing)
+
+	@$(call install_copy, gmp4, 0, 0, 0644, \
 		$(GMP4_DIR)/.libs/libgmp.so.3.3.3, \
 		/usr/lib/libgmp.so.3.3.3)
 
-	@$(call install_link, libgmp.so.3.3.3, /usr/lib/libgmp.so.3)
-	@$(call install_link, libgmp.so.3.3.3, /usr/lib/libgmp.so)
+	@$(call install_link, gmp4, libgmp.so.3.3.3, /usr/lib/libgmp.so.3)
+	@$(call install_link, gmp4, libgmp.so.3.3.3, /usr/lib/libgmp.so)
 
-	@$(call install_finish)
+	@$(call install_finish, gmp4)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/gnupg.make b/rules/gnupg.make
index 7e6263d8b..6f576c106 100644
--- a/rules/gnupg.make
+++ b/rules/gnupg.make
@@ -130,18 +130,18 @@ gnupg_targetinstall: $(STATEDIR)/gnupg.targetinstall
 $(STATEDIR)/gnupg.targetinstall: $(gnupg_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,gnupg)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(GNUPG_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Jiri Nesladek <nesladek\@2n.cz>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(GNUPG_DIR)/g10/gpg, /usr/bin/gpg)
-
-	@$(call install_finish)
+	@$(call install_init, gnupg)
+	@$(call install_fixup, gnupg,PACKAGE,gnupg)
+	@$(call install_fixup, gnupg,PRIORITY,optional)
+	@$(call install_fixup, gnupg,VERSION,$(GNUPG_VERSION))
+	@$(call install_fixup, gnupg,SECTION,base)
+	@$(call install_fixup, gnupg,AUTHOR,"Jiri Nesladek <nesladek\@2n.cz>")
+	@$(call install_fixup, gnupg,DEPENDS,)
+	@$(call install_fixup, gnupg,DESCRIPTION,missing)
+
+	@$(call install_copy, gnupg, 0, 0, 0755, $(GNUPG_DIR)/g10/gpg, /usr/bin/gpg)
+
+	@$(call install_finish, gnupg)
 
 	@$(call touch, $@)
 
diff --git a/rules/gnuplot.make b/rules/gnuplot.make
index 037ee16f3..d915b7f0b 100644
--- a/rules/gnuplot.make
+++ b/rules/gnuplot.make
@@ -175,18 +175,18 @@ gnuplot_targetinstall: $(STATEDIR)/gnuplot.targetinstall
 $(STATEDIR)/gnuplot.targetinstall: $(gnuplot_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,gnuplot)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(GNUPLOT_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(GNUPLOT_DIR)/src/gnuplot, /usr/bin/gnuplot)
-
-	@$(call install_finish)
+	@$(call install_init, gnuplot)
+	@$(call install_fixup, gnuplot,PACKAGE,gnuplot)
+	@$(call install_fixup, gnuplot,PRIORITY,optional)
+	@$(call install_fixup, gnuplot,VERSION,$(GNUPLOT_VERSION))
+	@$(call install_fixup, gnuplot,SECTION,base)
+	@$(call install_fixup, gnuplot,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, gnuplot,DEPENDS,)
+	@$(call install_fixup, gnuplot,DESCRIPTION,missing)
+
+	@$(call install_copy, gnuplot, 0, 0, 0755, $(GNUPLOT_DIR)/src/gnuplot, /usr/bin/gnuplot)
+
+	@$(call install_finish, gnuplot)
 
 	@$(call touch, $@)
 
diff --git a/rules/grub.make b/rules/grub.make
index f87eb1612..52688d954 100644
--- a/rules/grub.make
+++ b/rules/grub.make
@@ -163,20 +163,20 @@ grub_targetinstall: $(STATEDIR)/grub.targetinstall
 $(STATEDIR)/grub.targetinstall: $(grub_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,grub)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(GRUB_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, $(GRUB_DIR)/stage1/stage1, /boot/grub/stage1)
-	@$(call install_copy, 0, 0, 0644, $(GRUB_DIR)/stage2/stage2, /boot/grub/stage2)
-	@$(call install_copy, 0, 0, 0755, $(GRUB_DIR)/grub/grub, /usr/sbin/grub)
-
-	@$(call install_finish)
+	@$(call install_init, grub)
+	@$(call install_fixup, grub,PACKAGE,grub)
+	@$(call install_fixup, grub,PRIORITY,optional)
+	@$(call install_fixup, grub,VERSION,$(GRUB_VERSION))
+	@$(call install_fixup, grub,SECTION,base)
+	@$(call install_fixup, grub,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, grub,DEPENDS,)
+	@$(call install_fixup, grub,DESCRIPTION,missing)
+
+	@$(call install_copy, grub, 0, 0, 0644, $(GRUB_DIR)/stage1/stage1, /boot/grub/stage1)
+	@$(call install_copy, grub, 0, 0, 0644, $(GRUB_DIR)/stage2/stage2, /boot/grub/stage2)
+	@$(call install_copy, grub, 0, 0, 0755, $(GRUB_DIR)/grub/grub, /usr/sbin/grub)
+
+	@$(call install_finish, grub)
 
 	@$(call touch, $@)
 
diff --git a/rules/gtk1210.make b/rules/gtk1210.make
index 708a7af68..6d9730d86 100644
--- a/rules/gtk1210.make
+++ b/rules/gtk1210.make
@@ -111,30 +111,30 @@ gtk1210_targetinstall: $(STATEDIR)/gtk1210.targetinstall
 $(STATEDIR)/gtk1210.targetinstall: $(gtk1210_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,gtk1210)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(GTK1210_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, gtk1210)
+	@$(call install_fixup, gtk1210,PACKAGE,gtk1210)
+	@$(call install_fixup, gtk1210,PRIORITY,optional)
+	@$(call install_fixup, gtk1210,VERSION,$(GTK1210_VERSION))
+	@$(call install_fixup, gtk1210,SECTION,base)
+	@$(call install_fixup, gtk1210,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, gtk1210,DEPENDS,)
+	@$(call install_fixup, gtk1210,DESCRIPTION,missing)
 
 	# gdk
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, gtk1210, 0, 0, 0644, \
 		$(GTK1210_DIR)/gdk/.libs/libgdk-1.2.so.0.9.1, \
 		/usr/lib/libgdk-1.2.so.0.9.1)
-	@$(call install_link, libgdk-1.2.so.0.9.1, /usr/lib/libgdk-1.2.so.0)
-	@$(call install_link, libgdk-1.2.so.0.9.1, /usr/lib/libgdk-1.2.so)
+	@$(call install_link, gtk1210, libgdk-1.2.so.0.9.1, /usr/lib/libgdk-1.2.so.0)
+	@$(call install_link, gtk1210, libgdk-1.2.so.0.9.1, /usr/lib/libgdk-1.2.so)
 
 	# gtk
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, gtk1210, 0, 0, 0644, \
 		$(GTK1210_DIR)/gtk/.libs/libgtk-1.2.so.0.9.1, \
 		/usr/lib/libgtk-1.2.so.0.9.1)
-	@$(call install_link, libgtk-1.2.so.0.9.1, /usr/lib/libgtk-1.2.so.0)
-	@$(call install_link, libgtk-1.2.so.0.9.1, /usr/lib/libgtk-1.2.so)
+	@$(call install_link, gtk1210, libgtk-1.2.so.0.9.1, /usr/lib/libgtk-1.2.so.0)
+	@$(call install_link, gtk1210, libgtk-1.2.so.0.9.1, /usr/lib/libgtk-1.2.so)
 
-	@$(call install_finish)
+	@$(call install_finish, gtk1210)
 
 	@$(call touch, $@)
 
diff --git a/rules/gtk2-engines.make b/rules/gtk2-engines.make
index 5f26f5d16..edc1d4f8b 100644
--- a/rules/gtk2-engines.make
+++ b/rules/gtk2-engines.make
@@ -105,26 +105,26 @@ gtk2-engines_targetinstall: $(STATEDIR)/gtk2-engines.targetinstall
 $(STATEDIR)/gtk2-engines.targetinstall: $(gtk2-engines_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,gtk2-engines)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(GTK2-ENGINES_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_init, gtk2-engines)
+	@$(call install_fixup, gtk2-engines,PACKAGE,gtk2-engines)
+	@$(call install_fixup, gtk2-engines,PRIORITY,optional)
+	@$(call install_fixup, gtk2-engines,VERSION,$(GTK2-ENGINES_VERSION))
+	@$(call install_fixup, gtk2-engines,SECTION,base)
+	@$(call install_fixup, gtk2-engines,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, gtk2-engines,DEPENDS,)
+	@$(call install_fixup, gtk2-engines,DESCRIPTION,missing)
+
+	@$(call install_copy, gtk2-engines, 0, 0, 0644, \
 		$(GTK2-ENGINES_DIR)/metal/.libs/libmetal.so, \
 		/usr/lib/engines/libmetal.so)
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, gtk2-engines, 0, 0, 0644, \
 		$(GTK2-ENGINES_DIR)/redmond95/.libs/libredmond95.so, \
 		/usr/lib/engines/libredmond95.so)
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, gtk2-engines, 0, 0, 0644, \
 		$(GTK2-ENGINES_DIR)/pixbuf/.libs/libpixmap.so, \
 		/usr/lib/engines/libpixmap.so)
 
-	@$(call install_finish)
+	@$(call install_finish, gtk2-engines)
 
 	@$(call touch, $@)
 
diff --git a/rules/gtk22.make b/rules/gtk22.make
index 000e9d82a..6f96a8b9d 100644
--- a/rules/gtk22.make
+++ b/rules/gtk22.make
@@ -121,41 +121,41 @@ gtk22_targetinstall: $(STATEDIR)/gtk22.targetinstall
 $(STATEDIR)/gtk22.targetinstall: $(gtk22_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,gtk22)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(GTK22_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_init, gtk22)
+	@$(call install_fixup, gtk22,PACKAGE,gtk22)
+	@$(call install_fixup, gtk22,PRIORITY,optional)
+	@$(call install_fixup, gtk22,VERSION,$(GTK22_VERSION))
+	@$(call install_fixup, gtk22,SECTION,base)
+	@$(call install_fixup, gtk22,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, gtk22,DEPENDS,)
+	@$(call install_fixup, gtk22,DESCRIPTION,missing)
+
+	@$(call install_copy, gtk22, 0, 0, 0644, \
 		$(GTK22_DIR)/gtk/.libs/libgtk-x11-2.0.so.0.302.0, \
 		/usr/lib/libgtk-x11-2.0.so.0.302.0)
-	@$(call install_link, libgtk-x11-2.0.so.0.302.0, /usr/lib/libgtk-x11-2.0.so.0)
-	@$(call install_link, libgtk-x11-2.0.so.0.302.0, /usr/lib/libgtk-x11-2.0.so)
+	@$(call install_link, gtk22, libgtk-x11-2.0.so.0.302.0, /usr/lib/libgtk-x11-2.0.so.0)
+	@$(call install_link, gtk22, libgtk-x11-2.0.so.0.302.0, /usr/lib/libgtk-x11-2.0.so)
 	
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, gtk22, 0, 0, 0644, \
 		$(GTK22_DIR)/gdk/.libs/libgdk-x11-2.0.so.0.302.0, \
 		/usr/lib/libgdk-x11-2.0.so.0.302.0)
-	@$(call install_link, libgdk-x11-2.0.so.0.302.0, /usr/lib/libgdk-x11-2.0.so.0)
-	@$(call install_link, libgdk-x11-2.0.so.0.302.0, /usr/lib/libgdk-x11-2.0.so)
+	@$(call install_link, gtk22, libgdk-x11-2.0.so.0.302.0, /usr/lib/libgdk-x11-2.0.so.0)
+	@$(call install_link, gtk22, libgdk-x11-2.0.so.0.302.0, /usr/lib/libgdk-x11-2.0.so)
 
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, gtk22, 0, 0, 0644, \
 		$(GTK22_DIR)/gdk-pixbuf/.libs/libgdk_pixbuf-2.0.so.0.302.0, \
 		/usr/lib/libgdk_pixbuf-2.0.so.0.302.0)
-	@$(call install_link, libgdk_pixbuf-2.0.so.0.302.0, /usr/lib/libgdk_pixbuf-2.0.so.0)
-	@$(call install_link, libgdk_pixbuf-2.0.so.0.302.0, /usr/lib/libgdk_pixbuf-2.0.so)
+	@$(call install_link, gtk22, libgdk_pixbuf-2.0.so.0.302.0, /usr/lib/libgdk_pixbuf-2.0.so.0)
+	@$(call install_link, gtk22, libgdk_pixbuf-2.0.so.0.302.0, /usr/lib/libgdk_pixbuf-2.0.so)
 	
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, gtk22, 0, 0, 0644, \
 		$(GTK22_DIR)/gdk-pixbuf/.libs/gdk-pixbuf-query-loaders, \
 		/usr/bin/gdk-pixbuf-query-loaders)
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, gtk22, 0, 0, 0644, \
 		$(GTK22_DIR)/gdk-pixbuf/.libs/libpixbufloader*so, \
 		/usr/lib/gdk-pixbuf-loaders/)
 
-	@$(call install_finish)
+	@$(call install_finish, gtk22)
 
 	@$(call touch, $@)
 
diff --git a/rules/gtk26.make b/rules/gtk26.make
index c1349b861..182ec0acb 100644
--- a/rules/gtk26.make
+++ b/rules/gtk26.make
@@ -107,41 +107,41 @@ gtk26_targetinstall: $(STATEDIR)/gtk26.targetinstall
 $(STATEDIR)/gtk26.targetinstall: $(gtk26_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,gtk26)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(GTK26_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_init, gtk26)
+	@$(call install_fixup, gtk26,PACKAGE,gtk26)
+	@$(call install_fixup, gtk26,PRIORITY,optional)
+	@$(call install_fixup, gtk26,VERSION,$(GTK26_VERSION))
+	@$(call install_fixup, gtk26,SECTION,base)
+	@$(call install_fixup, gtk26,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, gtk26,DEPENDS,)
+	@$(call install_fixup, gtk26,DESCRIPTION,missing)
+
+	@$(call install_copy, gtk26, 0, 0, 0644, \
 		$(GTK26_DIR)/gtk/.libs/libgtk-x11-2.0.so.0.302.0, \
 		/usr/lib/libgtk-x11-2.0.so.0.302.0)
-	@$(call install_link, libgtk-x11-2.0.so.0.302.0, /usr/lib/libgtk-x11-2.0.so.0)
-	@$(call install_link, libgtk-x11-2.0.so.0.302.0, /usr/lib/libgtk-x11-2.0.so)
+	@$(call install_link, gtk26, libgtk-x11-2.0.so.0.302.0, /usr/lib/libgtk-x11-2.0.so.0)
+	@$(call install_link, gtk26, libgtk-x11-2.0.so.0.302.0, /usr/lib/libgtk-x11-2.0.so)
 
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, gtk26, 0, 0, 0644, \
 		$(GTK26_DIR)/gdk/.libs/libgdk-x11-2.0.so.0.302.0, \
 		/usr/lib/libgdk-x11-2.0.so.0.302.0)
-	@$(call install_link, libgdk-x11-2.0.so.0.302.0, /usr/lib/libgdk-x11-2.0.so.0)
-	@$(call install_link, libgdk-x11-2.0.so.0.302.0, /usr/lib/libgdk-x11-2.0.so)
+	@$(call install_link, gtk26, libgdk-x11-2.0.so.0.302.0, /usr/lib/libgdk-x11-2.0.so.0)
+	@$(call install_link, gtk26, libgdk-x11-2.0.so.0.302.0, /usr/lib/libgdk-x11-2.0.so)
 
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, gtk26, 0, 0, 0644, \
 		$(GTK26_DIR)/gdk-pixbuf/.libs/libgdk_pixbuf-2.0.so.0.302.0, \
 		/usr/lib/libgdk_pixbuf-2.0.so.0.302.0)
-	@$(call install_link, libgdk_pixbuf-2.0.so.0.302.0, /usr/lib/libgdk_pixbuf-2.0.so.0)
-	@$(call install_link, libgdk_pixbuf-2.0.so.0.302.0, /usr/lib/libgdk_pixbuf-2.0.so)
+	@$(call install_link, gtk26, libgdk_pixbuf-2.0.so.0.302.0, /usr/lib/libgdk_pixbuf-2.0.so.0)
+	@$(call install_link, gtk26, libgdk_pixbuf-2.0.so.0.302.0, /usr/lib/libgdk_pixbuf-2.0.so)
 
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, gtk26, 0, 0, 0644, \
 		$(GTK26_DIR)/gdk-pixbuf/.libs/gdk-pixbuf-query-loaders, \
 		/usr/bin/gdk-pixbuf-query-loaders)
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, gtk26, 0, 0, 0644, \
 		$(GTK26_DIR)/gdk-pixbuf/.libs/libpixbufloader*so, \
 		/usr/lib/gdk-pixbuf-loaders/)
 
-	@$(call install_finish)
+	@$(call install_finish, gtk26)
 
 	@$(call touch, $@)
 
diff --git a/rules/hdparm.make b/rules/hdparm.make
index b1c51dcf6..773c4ba7e 100644
--- a/rules/hdparm.make
+++ b/rules/hdparm.make
@@ -103,18 +103,18 @@ hdparm_targetinstall: $(STATEDIR)/hdparm.targetinstall
 $(STATEDIR)/hdparm.targetinstall: $(hdparm_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,hdparm)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(HDPARM_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(HDPARM_DIR)/hdparm, /usr/bin/hdparm)
-
-	@$(call install_finish)
+	@$(call install_init, hdparm)
+	@$(call install_fixup, hdparm,PACKAGE,hdparm)
+	@$(call install_fixup, hdparm,PRIORITY,optional)
+	@$(call install_fixup, hdparm,VERSION,$(HDPARM_VERSION))
+	@$(call install_fixup, hdparm,SECTION,base)
+	@$(call install_fixup, hdparm,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, hdparm,DEPENDS,)
+	@$(call install_fixup, hdparm,DESCRIPTION,missing)
+
+	@$(call install_copy, hdparm, 0, 0, 0755, $(HDPARM_DIR)/hdparm, /usr/bin/hdparm)
+
+	@$(call install_finish, hdparm)
 
 	@$(call touch, $@)
 
diff --git a/rules/hexedit.make b/rules/hexedit.make
index ba7856076..bdfd5d015 100644
--- a/rules/hexedit.make
+++ b/rules/hexedit.make
@@ -108,18 +108,18 @@ hexedit_targetinstall: $(STATEDIR)/hexedit.targetinstall
 $(STATEDIR)/hexedit.targetinstall: $(hexedit_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,hexedit)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(HEXEDIT_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(HEXEDIT_DIR)/hexedit, /usr/bin/hexedit)	
-
-	@$(call install_finish)
+	@$(call install_init, hexedit)
+	@$(call install_fixup, hexedit,PACKAGE,hexedit)
+	@$(call install_fixup, hexedit,PRIORITY,optional)
+	@$(call install_fixup, hexedit,VERSION,$(HEXEDIT_VERSION))
+	@$(call install_fixup, hexedit,SECTION,base)
+	@$(call install_fixup, hexedit,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, hexedit,DEPENDS,)
+	@$(call install_fixup, hexedit,DESCRIPTION,missing)
+
+	@$(call install_copy, hexedit, 0, 0, 0755, $(HEXEDIT_DIR)/hexedit, /usr/bin/hexedit)	
+
+	@$(call install_finish, hexedit)
 
 	@$(call touch, $@)
 
diff --git a/rules/hotplug.make b/rules/hotplug.make
index 597a22a44..a771b5cb9 100644
--- a/rules/hotplug.make
+++ b/rules/hotplug.make
@@ -96,62 +96,62 @@ hotplug_targetinstall: $(STATEDIR)/hotplug.targetinstall
 $(STATEDIR)/hotplug.targetinstall: $(hotplug_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,hotplug)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(subst _,,$(HOTPLUG_VERSION)))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(HOTPLUG_DIR)/sbin/hotplug, /sbin/hotplug, n)
-	@$(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/hotplug.functions, /etc/hotplug/hotplug.functions, n)
-	@$(call install_copy, 0, 0, 0755, $(HOTPLUG_DIR)/etc/hotplug.d/default/default.hotplug, /etc/hotplug.d/default/default.hotplug, n)
+	@$(call install_init, hotplug)
+	@$(call install_fixup, hotplug,PACKAGE,hotplug)
+	@$(call install_fixup, hotplug,PRIORITY,optional)
+	@$(call install_fixup, hotplug,VERSION,$(subst _,,$(HOTPLUG_VERSION)))
+	@$(call install_fixup, hotplug,SECTION,base)
+	@$(call install_fixup, hotplug,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, hotplug,DEPENDS,)
+	@$(call install_fixup, hotplug,DESCRIPTION,missing)
+
+	@$(call install_copy, hotplug, 0, 0, 0755, $(HOTPLUG_DIR)/sbin/hotplug, /sbin/hotplug, n)
+	@$(call install_copy, hotplug, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/hotplug.functions, /etc/hotplug/hotplug.functions, n)
+	@$(call install_copy, hotplug, 0, 0, 0755, $(HOTPLUG_DIR)/etc/hotplug.d/default/default.hotplug, /etc/hotplug.d/default/default.hotplug, n)
 
 ifdef PTXCONF_HOTPLUG_BLACKLIST
-	@$(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/blacklist, /etc/hotplug/blacklist, n)
+	@$(call install_copy, hotplug, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/blacklist, /etc/hotplug/blacklist, n)
 endif
 ifdef PTXCONF_HOTPLUG_FIRMWARE
-	@$(call install_copy, 0, 0, 0755, $(HOTPLUG_DIR)/etc/hotplug/firmware.agent, /etc/hotplug/firmware.agent, n)
-	@$(call install_copy, 0, 0, 0755, /usr/lib/hotplug/firmware)
+	@$(call install_copy, hotplug, 0, 0, 0755, $(HOTPLUG_DIR)/etc/hotplug/firmware.agent, /etc/hotplug/firmware.agent, n)
+	@$(call install_copy, hotplug, 0, 0, 0755, /usr/lib/hotplug/firmware)
 endif
 ifdef PTXCONF_HOTPLUG_IEEE1394
-	@$(call install_copy, 0, 0, 0755, $(HOTPLUG_DIR)/etc/hotplug/ieee1394.agent, /etc/hotplug/ieee1394.agent, n)
+	@$(call install_copy, hotplug, 0, 0, 0755, $(HOTPLUG_DIR)/etc/hotplug/ieee1394.agent, /etc/hotplug/ieee1394.agent, n)
 endif
 ifdef PTXCONF_HOTPLUG_NET
-	@$(call install_copy, 0, 0, 0755, $(HOTPLUG_DIR)/etc/hotplug/net.agent, /etc/hotplug/net.agent, n)
+	@$(call install_copy, hotplug, 0, 0, 0755, $(HOTPLUG_DIR)/etc/hotplug/net.agent, /etc/hotplug/net.agent, n)
 endif
 ifdef PTXCONF_HOTPLUG_PCI
-	@$(call install_copy, 0, 0, 0755, $(HOTPLUG_DIR)/etc/hotplug/pci.agent, /etc/hotplug/pci.agent, n)
-	@$(call install_copy, 0, 0, 0755, $(HOTPLUG_DIR)/etc/hotplug/pci.rc, /etc/hotplug/pci.rc, n)
-	@$(call install_copy, 0, 0, 0755, /etc/hotplug/pci)
+	@$(call install_copy, hotplug, 0, 0, 0755, $(HOTPLUG_DIR)/etc/hotplug/pci.agent, /etc/hotplug/pci.agent, n)
+	@$(call install_copy, hotplug, 0, 0, 0755, $(HOTPLUG_DIR)/etc/hotplug/pci.rc, /etc/hotplug/pci.rc, n)
+	@$(call install_copy, hotplug, 0, 0, 0755, /etc/hotplug/pci)
 endif
 ifdef PTXCONF_HOTPLUG_SCSI
-	@$(call install_copy, 0, 0, 0755, $(HOTPLUG_DIR)/etc/hotplug/scsi.agent, /etc/hotplug/scsi.agent, n)
+	@$(call install_copy, hotplug, 0, 0, 0755, $(HOTPLUG_DIR)/etc/hotplug/scsi.agent, /etc/hotplug/scsi.agent, n)
 endif
 ifdef PTXCONF_HOTPLUG_USB
-	@$(call install_copy, 0, 0, 0755, $(HOTPLUG_DIR)/etc/hotplug/usb.agent, /etc/hotplug/usb.agent, n)
-	@$(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/usb.distmap, /etc/hotplug/usb.distmap, n)
-	@$(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/usb.handmap, /etc/hotplug/usb.handmap, n)
-	@$(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/usb.usermap, /etc/hotplug/usb.usermap, n)
-	@$(call install_copy, 0, 0, 0755, $(HOTPLUG_DIR)/etc/hotplug/usb.rc, /etc/hotplug/usb.rc, n)
-	@$(call install_copy, 0, 0, 0755, /etc/hotplug/usb.d)
+	@$(call install_copy, hotplug, 0, 0, 0755, $(HOTPLUG_DIR)/etc/hotplug/usb.agent, /etc/hotplug/usb.agent, n)
+	@$(call install_copy, hotplug, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/usb.distmap, /etc/hotplug/usb.distmap, n)
+	@$(call install_copy, hotplug, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/usb.handmap, /etc/hotplug/usb.handmap, n)
+	@$(call install_copy, hotplug, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/usb.usermap, /etc/hotplug/usb.usermap, n)
+	@$(call install_copy, hotplug, 0, 0, 0755, $(HOTPLUG_DIR)/etc/hotplug/usb.rc, /etc/hotplug/usb.rc, n)
+	@$(call install_copy, hotplug, 0, 0, 0755, /etc/hotplug/usb.d)
 endif
 ifdef PTXCONF_HOTPLUG_INPUT
-	@$(call install_copy, 0, 0, 0755, $(HOTPLUG_DIR)/etc/hotplug/input.agent, /etc/hotplug/input.agent, n)
-	@$(call install_copy, 0, 0, 0755, $(HOTPLUG_DIR)/etc/hotplug/input.rc, /etc/hotplug/input.rc, n)
+	@$(call install_copy, hotplug, 0, 0, 0755, $(HOTPLUG_DIR)/etc/hotplug/input.agent, /etc/hotplug/input.agent, n)
+	@$(call install_copy, hotplug, 0, 0, 0755, $(HOTPLUG_DIR)/etc/hotplug/input.rc, /etc/hotplug/input.rc, n)
 endif
 ifdef PTXCONF_HOTPLUG_DASD
-	@$(call install_copy, 0, 0, 0755, $(HOTPLUG_DIR)/etc/hotplug/dasd.agent, /etc/hotplug/dasd.agent, n)
-	@$(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/dasd.permissions, /etc/hotplug/dasd.permissions, n)
+	@$(call install_copy, hotplug, 0, 0, 0755, $(HOTPLUG_DIR)/etc/hotplug/dasd.agent, /etc/hotplug/dasd.agent, n)
+	@$(call install_copy, hotplug, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/dasd.permissions, /etc/hotplug/dasd.permissions, n)
 endif
 ifdef PTXCONF_HOTPLUG_TAPE
-	@$(call install_copy, 0, 0, 0755, $(HOTPLUG_DIR)/etc/hotplug/tape.agent, /etc/hotplug/tape.agent, n)
-	@$(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/tape.permissions, /etc/hotplug/tape.permissions, n)
+	@$(call install_copy, hotplug, 0, 0, 0755, $(HOTPLUG_DIR)/etc/hotplug/tape.agent, /etc/hotplug/tape.agent, n)
+	@$(call install_copy, hotplug, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/tape.permissions, /etc/hotplug/tape.permissions, n)
 endif
 
-	@$(call install_finish)
+	@$(call install_finish, hotplug)
 
 	@$(call touch, $@)
 
diff --git a/rules/hrtimers-support.make b/rules/hrtimers-support.make
index 82d1affaa..72cc712a7 100644
--- a/rules/hrtimers-support.make
+++ b/rules/hrtimers-support.make
@@ -107,28 +107,28 @@ hrtimers-support_targetinstall: $(STATEDIR)/hrtimers-support.targetinstall
 $(STATEDIR)/hrtimers-support.targetinstall: $(hrtimers-support_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,hrtimers-support)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(HRTIMERS_SUPPORT_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_init, hrtimers-support)
+	@$(call install_fixup, hrtimers-support,PACKAGE,hrtimers-support)
+	@$(call install_fixup, hrtimers-support,PRIORITY,optional)
+	@$(call install_fixup, hrtimers-support,VERSION,$(HRTIMERS_SUPPORT_VERSION))
+	@$(call install_fixup, hrtimers-support,SECTION,base)
+	@$(call install_fixup, hrtimers-support,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, hrtimers-support,DEPENDS,)
+	@$(call install_fixup, hrtimers-support,DESCRIPTION,missing)
+
+	@$(call install_copy, hrtimers-support, 0, 0, 0644, \
 		$(HRTIMERS_SUPPORT_DIR)/lib/.libs/libposix-time.so.1.0.0, \
 		/usr/lib/libposix-time.so.1.0.0)
 
-	@$(call install_link, \
+	@$(call install_link, hrtimers-support, \
 		libposix-time.so.1.0.0, \
 		/usr/lib/libposix-time.so.1)
 
-	@$(call install_link, \
+	@$(call install_link, hrtimers-support, \
 		libposix-time.so.1.0.0, \
 		/usr/lib/libposix-time.so)
 
-	@$(call install_finish)
+	@$(call install_finish, hrtimers-support)
 
 	@$(call touch, $@)
 
diff --git a/rules/inetutils.make b/rules/inetutils.make
index f74fd29bc..517ec9fce 100644
--- a/rules/inetutils.make
+++ b/rules/inetutils.make
@@ -136,37 +136,37 @@ inetutils_targetinstall: $(STATEDIR)/inetutils.targetinstall
 $(STATEDIR)/inetutils.targetinstall: $(inetutils_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,inetutils)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(INETUTILS_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, inetutils)
+	@$(call install_fixup, inetutils,PACKAGE,inetutils)
+	@$(call install_fixup, inetutils,PRIORITY,optional)
+	@$(call install_fixup, inetutils,VERSION,$(INETUTILS_VERSION))
+	@$(call install_fixup, inetutils,SECTION,base)
+	@$(call install_fixup, inetutils,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, inetutils,DEPENDS,)
+	@$(call install_fixup, inetutils,DESCRIPTION,missing)
 
 ifdef PTXCONF_INETUTILS_INETD
-	@$(call install_copy, 0, 0, 0755, $(INETUTILS_DIR)/inetd/inetd, /usr/sbin/inetd)
+	@$(call install_copy, inetutils, 0, 0, 0755, $(INETUTILS_DIR)/inetd/inetd, /usr/sbin/inetd)
 endif
 ifdef PTXCONF_INETUTILS_PING
-	@$(call install_copy, 0, 0, 0755, $(INETUTILS_DIR)/ping/ping, /bin/ping)
+	@$(call install_copy, inetutils, 0, 0, 0755, $(INETUTILS_DIR)/ping/ping, /bin/ping)
 endif
 ifdef PTXCONF_INETUTILS_RCP
-	@$(call install_copy, 0, 0, 0755, $(INETUTILS_DIR)/rcp/rcp, /usr/bin/rcp)
+	@$(call install_copy, inetutils, 0, 0, 0755, $(INETUTILS_DIR)/rcp/rcp, /usr/bin/rcp)
 endif
 ifdef PTXCONF_INETUTILS_RLOGIND
-	@$(call install_copy, 0, 0, 0755, $(INETUTILS_DIR)/rlogind/rlogind, /usr/sbin/rlogind)
+	@$(call install_copy, inetutils, 0, 0, 0755, $(INETUTILS_DIR)/rlogind/rlogind, /usr/sbin/rlogind)
 endif
 ifdef PTXCONF_INETUTILS_RSH
-	@$(call install_copy, 0, 0, 0755, $(INETUTILS_DIR)/rsh/rsh, /usr/bin/rsh)
+	@$(call install_copy, inetutils, 0, 0, 0755, $(INETUTILS_DIR)/rsh/rsh, /usr/bin/rsh)
 endif
 ifdef PTXCONF_INETUTILS_RSHD
-	@$(call install_copy, 0, 0, 0755, $(INETUTILS_DIR)/rshd/rshd, /usr/sbin/rshd)
+	@$(call install_copy, inetutils, 0, 0, 0755, $(INETUTILS_DIR)/rshd/rshd, /usr/sbin/rshd)
 endif
 ifdef PTXCONF_INETUTILS_SYSLOGD
-	@$(call install_copy, 0, 0, 0755, $(INETUTILS_DIR)/syslogd/syslogd, /sbin/syslogd)
+	@$(call install_copy, inetutils, 0, 0, 0755, $(INETUTILS_DIR)/syslogd/syslogd, /sbin/syslogd)
 endif
-	@$(call install_finish)
+	@$(call install_finish, inetutils)
 
 	@$(call touch, $@)
 
diff --git a/rules/ipkg.make b/rules/ipkg.make
index cbca73c75..72fa69174 100644
--- a/rules/ipkg.make
+++ b/rules/ipkg.make
@@ -106,34 +106,34 @@ ipkg_targetinstall: $(STATEDIR)/ipkg.targetinstall
 $(STATEDIR)/ipkg.targetinstall: $(ipkg_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,ipkg)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(IPKG_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, $(IPKG_DIR)/.libs/libipkg.so.0.0.0, /usr/lib/libipkg.so.0.0.0)
-	@$(call install_link, libipkg.so.0.0.0, /usr/lib/libipkg.so.0.0)
-	@$(call install_link, libipkg.so.0.0.0, /usr/lib/libipkg.so.0)
+	@$(call install_init, ipkg)
+	@$(call install_fixup, ipkg,PACKAGE,ipkg)
+	@$(call install_fixup, ipkg,PRIORITY,optional)
+	@$(call install_fixup, ipkg,VERSION,$(IPKG_VERSION))
+	@$(call install_fixup, ipkg,SECTION,base)
+	@$(call install_fixup, ipkg,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, ipkg,DEPENDS,)
+	@$(call install_fixup, ipkg,DESCRIPTION,missing)
+
+	@$(call install_copy, ipkg, 0, 0, 0644, $(IPKG_DIR)/.libs/libipkg.so.0.0.0, /usr/lib/libipkg.so.0.0.0)
+	@$(call install_link, ipkg, libipkg.so.0.0.0, /usr/lib/libipkg.so.0.0)
+	@$(call install_link, ipkg, libipkg.so.0.0.0, /usr/lib/libipkg.so.0)
 
 ifdef PTXCONF_IPKG_LOG_WRAPPER
-	@$(call install_copy, 0, 0, 0755, $(IPKG_DIR)/.libs/ipkg-cl, /usr/bin/ipkg-cl)
-	@$(call install_copy, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/bin/ipkg_log_wrapper, /usr/bin/ipkg, n)
+	@$(call install_copy, ipkg, 0, 0, 0755, $(IPKG_DIR)/.libs/ipkg-cl, /usr/bin/ipkg-cl)
+	@$(call install_copy, ipkg, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/bin/ipkg_log_wrapper, /usr/bin/ipkg, n)
 else
-	@$(call install_copy, 0, 0, 0755, $(IPKG_DIR)/.libs/ipkg-cl, /usr/bin/ipkg)
+	@$(call install_copy, ipkg, 0, 0, 0755, $(IPKG_DIR)/.libs/ipkg-cl, /usr/bin/ipkg)
 endif
 
 ifdef PTXCONF_IPKG_EXTRACT_TEST
-	@$(call install_copy, 0, 0, 0755, $(IPKG_DIR)/ipkg_extract_test, /usr/bin/ipkg_extract_test)
+	@$(call install_copy, ipkg, 0, 0, 0755, $(IPKG_DIR)/ipkg_extract_test, /usr/bin/ipkg_extract_test)
 endif
 ifdef PTXCONF_IPKG_HASH_TEST
-	@$(call install_copy, 0, 0, 0755, $(IPKG_DIR)/ipkg_hash_test, /usr/bin/ipkg_hash_test)
+	@$(call install_copy, ipkg, 0, 0, 0755, $(IPKG_DIR)/ipkg_hash_test, /usr/bin/ipkg_hash_test)
 endif
 
-	@$(call install_finish)
+	@$(call install_finish, ipkg)
 
 	@$(call touch, $@)
 
diff --git a/rules/iptables.make b/rules/iptables.make
index 973378ce5..24ef8b05c 100644
--- a/rules/iptables.make
+++ b/rules/iptables.make
@@ -99,337 +99,337 @@ iptables_targetinstall: $(STATEDIR)/iptables.targetinstall
 $(STATEDIR)/iptables.targetinstall: $(iptables_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,iptables)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(IPTABLES_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, iptables)
+	@$(call install_fixup, iptables,PACKAGE,iptables)
+	@$(call install_fixup, iptables,PRIORITY,optional)
+	@$(call install_fixup, iptables,VERSION,$(IPTABLES_VERSION))
+	@$(call install_fixup, iptables,SECTION,base)
+	@$(call install_fixup, iptables,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, iptables,DEPENDS,)
+	@$(call install_fixup, iptables,DESCRIPTION,missing)
 
 ifdef PTXCONF_IPTABLES_INSTALL_IP6TABLES
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/ip6tables, /sbin/ip6tables)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/ip6tables, /sbin/ip6tables)
 endif
 ifdef PTXCONF_IPTABLES_INSTALL_IPTABLES
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/iptables, /sbin/iptables)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/iptables, /sbin/iptables)
 endif
 ifdef PTXCONF_IPTABLES_INSTALL_IPTABLES_RESTORE
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/iptables-restore, /sbin/iptables-restore)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/iptables-restore, /sbin/iptables-restore)
 endif
 ifdef PTXCONF_IPTABLES_INSTALL_IPTABLES_SAVE
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/iptables-save, /sbin/iptables-save)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/iptables-save, /sbin/iptables-save)
 endif
 
 # --- iptables stuff
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_addrtype
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_addrtype.so, /usr/lib/iptables/libipt_addrtype.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_addrtype.so, /usr/lib/iptables/libipt_addrtype.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_ah
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_ah.so, /usr/lib/iptables/libipt_ah.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_ah.so, /usr/lib/iptables/libipt_ah.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_CLASSIFY
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_CLASSIFY.so, /usr/lib/iptables/libipt_CLASSIFY.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_CLASSIFY.so, /usr/lib/iptables/libipt_CLASSIFY.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_CLUSTERIP
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_CLUSTERIP.so, /usr/lib/iptables/libipt_CLUSTERIP.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_CLUSTERIP.so, /usr/lib/iptables/libipt_CLUSTERIP.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_connlimit
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_connlimit.so, /usr/lib/iptables/libipt_connlimit.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_connlimit.so, /usr/lib/iptables/libipt_connlimit.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_connmark
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_connmark.so, /usr/lib/iptables/libipt_connmark.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_connmark.so, /usr/lib/iptables/libipt_connmark.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_CONNMARK
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_CONNMARK.so, /usr/lib/iptables/libipt_CONNMARK.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_CONNMARK.so, /usr/lib/iptables/libipt_CONNMARK.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_conntrack
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_conntrack.so, /usr/lib/iptables/libipt_conntrack.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_conntrack.so, /usr/lib/iptables/libipt_conntrack.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_DNAT
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_DNAT.so, /usr/lib/iptables/libipt_DNAT.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_DNAT.so, /usr/lib/iptables/libipt_DNAT.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_dscp
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_dscp.so, /usr/lib/iptables/libipt_dscp.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_dscp.so, /usr/lib/iptables/libipt_dscp.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_DSCP
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_DSCP.so, /usr/lib/iptables/libipt_DSCP.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_DSCP.so, /usr/lib/iptables/libipt_DSCP.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_ecn
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_ecn.so, /usr/lib/iptables/libipt_ecn.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_ecn.so, /usr/lib/iptables/libipt_ecn.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_ECN
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_ECN.so, /usr/lib/iptables/libipt_ECN.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_ECN.so, /usr/lib/iptables/libipt_ECN.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_esp
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_esp.so, /usr/lib/iptables/libipt_esp.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_esp.so, /usr/lib/iptables/libipt_esp.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_helper
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_helper.so, /usr/lib/iptables/libipt_helper.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_helper.so, /usr/lib/iptables/libipt_helper.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_icmp
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_icmp.so, /usr/lib/iptables/libipt_icmp.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_icmp.so, /usr/lib/iptables/libipt_icmp.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_iprange
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_iprange.so, /usr/lib/iptables/libipt_iprange.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_iprange.so, /usr/lib/iptables/libipt_iprange.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_length
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_length.so, /usr/lib/iptables/libipt_length.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_length.so, /usr/lib/iptables/libipt_length.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_limit
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_limit.so, /usr/lib/iptables/libipt_limit.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_limit.so, /usr/lib/iptables/libipt_limit.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_LOG
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_LOG.so, /usr/lib/iptables/libipt_LOG.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_LOG.so, /usr/lib/iptables/libipt_LOG.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_mac
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_mac.so, /usr/lib/iptables/libipt_mac.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_mac.so, /usr/lib/iptables/libipt_mac.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_mark
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_mark.so, /usr/lib/iptables/libipt_mark.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_mark.so, /usr/lib/iptables/libipt_mark.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_MARK
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_MARK.so, /usr/lib/iptables/libipt_MARK.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_MARK.so, /usr/lib/iptables/libipt_MARK.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_MASQUERADE
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_MASQUERADE.so, /usr/lib/iptables/libipt_MASQUERADE.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_MASQUERADE.so, /usr/lib/iptables/libipt_MASQUERADE.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_MIRROR
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_MIRROR.so, /usr/lib/iptables/libipt_MIRROR.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_MIRROR.so, /usr/lib/iptables/libipt_MIRROR.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_multiport
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_multiport.so, /usr/lib/iptables/libipt_multiport.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_multiport.so, /usr/lib/iptables/libipt_multiport.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_NETMAP
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_NETMAP.so, /usr/lib/iptables/libipt_NETMAP.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_NETMAP.so, /usr/lib/iptables/libipt_NETMAP.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_NOTRACK
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_NOTRACK.so, /usr/lib/iptables/libipt_NOTRACK.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_NOTRACK.so, /usr/lib/iptables/libipt_NOTRACK.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_owner
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_owner.so, /usr/lib/iptables/libipt_owner.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_owner.so, /usr/lib/iptables/libipt_owner.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_physdev
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_physdev.so, /usr/lib/iptables/libipt_physdev.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_physdev.so, /usr/lib/iptables/libipt_physdev.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_pkttype
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_pkttype.so, /usr/lib/iptables/libipt_pkttype.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_pkttype.so, /usr/lib/iptables/libipt_pkttype.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_realm
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_realm.so, /usr/lib/iptables/libipt_realm.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_realm.so, /usr/lib/iptables/libipt_realm.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_recent
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_recent.so, /usr/lib/iptables/libipt_recent.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_recent.so, /usr/lib/iptables/libipt_recent.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_REDIRECT
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_REDIRECT.so, /usr/lib/iptables/libipt_REDIRECT.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_REDIRECT.so, /usr/lib/iptables/libipt_REDIRECT.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_REJECT
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_REJECT.so, /usr/lib/iptables/libipt_REJECT.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_REJECT.so, /usr/lib/iptables/libipt_REJECT.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_rpc
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_rpc.so, /usr/lib/iptables/libipt_rpc.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_rpc.so, /usr/lib/iptables/libipt_rpc.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_SAME
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_SAME.so, /usr/lib/iptables/libipt_SAME.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_SAME.so, /usr/lib/iptables/libipt_SAME.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_sctp
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_sctp.so, /usr/lib/iptables/libipt_sctp.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_sctp.so, /usr/lib/iptables/libipt_sctp.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_SNAT
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_SNAT.so, /usr/lib/iptables/libipt_SNAT.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_SNAT.so, /usr/lib/iptables/libipt_SNAT.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_standard
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_standard.so, /usr/lib/iptables/libipt_standard.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_standard.so, /usr/lib/iptables/libipt_standard.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_state
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_state.so, /usr/lib/iptables/libipt_state.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_state.so, /usr/lib/iptables/libipt_state.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_TARPIT
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_TARPIT.so, /usr/lib/iptables/libipt_TARPIT.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_TARPIT.so, /usr/lib/iptables/libipt_TARPIT.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_tcpmss
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_tcpmss.so, /usr/lib/iptables/libipt_tcpmss.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_tcpmss.so, /usr/lib/iptables/libipt_tcpmss.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_TCPMSS
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_TCPMSS.so, /usr/lib/iptables/libipt_TCPMSS.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_TCPMSS.so, /usr/lib/iptables/libipt_TCPMSS.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_tcp
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_tcp.so, /usr/lib/iptables/libipt_tcp.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_tcp.so, /usr/lib/iptables/libipt_tcp.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_tos
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_tos.so, /usr/lib/iptables/libipt_tos.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_tos.so, /usr/lib/iptables/libipt_tos.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_TOS
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_TOS.so, /usr/lib/iptables/libipt_TOS.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_TOS.so, /usr/lib/iptables/libipt_TOS.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_TRACE
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_TRACE.so, /usr/lib/iptables/libipt_TRACE.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_TRACE.so, /usr/lib/iptables/libipt_TRACE.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_ttl
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_ttl.so, /usr/lib/iptables/libipt_ttl.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_ttl.so, /usr/lib/iptables/libipt_ttl.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_TTL
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_TTL.so, /usr/lib/iptables/libipt_TTL.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_TTL.so, /usr/lib/iptables/libipt_TTL.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_udp
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_udp.so, /usr/lib/iptables/libipt_udp.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_udp.so, /usr/lib/iptables/libipt_udp.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_ULOG
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_ULOG.so, /usr/lib/iptables/libipt_ULOG.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_ULOG.so, /usr/lib/iptables/libipt_ULOG.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_unclean
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_unclean.so, /usr/lib/iptables/libipt_unclean.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_unclean.so, /usr/lib/iptables/libipt_unclean.so, n)
 endif
 
 # --- ip6tables stuff
 
 ifdef PTXCONF_IPTABLES_INSTALL_libip6t_ah
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_ah.so, /usr/lib/iptables/libip6t_ah.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_ah.so, /usr/lib/iptables/libip6t_ah.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libip6t_dst
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_dst.so, /usr/lib/iptables/libip6t_dst.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_dst.so, /usr/lib/iptables/libip6t_dst.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libip6t_esp
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_esp.so, /usr/lib/iptables/libip6t_esp.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_esp.so, /usr/lib/iptables/libip6t_esp.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libip6t_eui64
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_eui64.so, /usr/lib/iptables/libip6t_eui64.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_eui64.so, /usr/lib/iptables/libip6t_eui64.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libip6t_frag
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_frag.so, /usr/lib/iptables/libip6t_frag.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_frag.so, /usr/lib/iptables/libip6t_frag.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libip6t_hbh
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_hbh.so, /usr/lib/iptables/libip6t_hbh.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_hbh.so, /usr/lib/iptables/libip6t_hbh.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libip6t_hl
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_hl.so, /usr/lib/iptables/libip6t_hl.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_hl.so, /usr/lib/iptables/libip6t_hl.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libip6t_HL
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_HL.so, /usr/lib/iptables/libip6t_HL.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_HL.so, /usr/lib/iptables/libip6t_HL.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libip6t_icmpv6
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_icmpv6.so, /usr/lib/iptables/libip6t_icmpv6.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_icmpv6.so, /usr/lib/iptables/libip6t_icmpv6.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libip6t_ipv6header
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_ipv6header.so, /usr/lib/iptables/libip6t_ipv6header.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_ipv6header.so, /usr/lib/iptables/libip6t_ipv6header.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libip6t_length
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_length.so, /usr/lib/iptables/libip6t_length.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_length.so, /usr/lib/iptables/libip6t_length.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libip6t_limit
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_limit.so, /usr/lib/iptables/libip6t_limit.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_limit.so, /usr/lib/iptables/libip6t_limit.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libip6t_LOG
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_LOG.so, /usr/lib/iptables/libip6t_LOG.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_LOG.so, /usr/lib/iptables/libip6t_LOG.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libip6t_mac
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_mac.so, /usr/lib/iptables/libip6t_mac.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_mac.so, /usr/lib/iptables/libip6t_mac.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libip6t_mark
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_mark.so, /usr/lib/iptables/libip6t_mark.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_mark.so, /usr/lib/iptables/libip6t_mark.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libip6t_MARK
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_MARK.so, /usr/lib/iptables/libip6t_MARK.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_MARK.so, /usr/lib/iptables/libip6t_MARK.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libip6t_multiport
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_multiport.so, /usr/lib/iptables/libip6t_multiport.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_multiport.so, /usr/lib/iptables/libip6t_multiport.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libip6t_owner
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_owner.so, /usr/lib/iptables/libip6t_owner.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_owner.so, /usr/lib/iptables/libip6t_owner.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libip6t_rt
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_rt.so, /usr/lib/iptables/libip6t_rt.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_rt.so, /usr/lib/iptables/libip6t_rt.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libip6t_standard
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_standard.so, /usr/lib/iptables/libip6t_standard.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_standard.so, /usr/lib/iptables/libip6t_standard.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libip6t_tcp
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_tcp.so, /usr/lib/iptables/libip6t_tcp.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_tcp.so, /usr/lib/iptables/libip6t_tcp.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libip6t_TRACE
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_TRACE.so, /usr/lib/iptables/libip6t_TRACE.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_TRACE.so, /usr/lib/iptables/libip6t_TRACE.so, n)
 endif
 
 ifdef PTXCONF_IPTABLES_INSTALL_libip6t_udp
-	@$(call install_copy, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_udp.so, /usr/lib/iptables/libip6t_udp.so, n)
+	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_udp.so, /usr/lib/iptables/libip6t_udp.so, n)
 endif
 
-	@$(call install_finish)	
+	@$(call install_finish, iptables)	
 
 
 	@$(call touch, $@)
diff --git a/rules/joe.make b/rules/joe.make
index e1e3b224e..a09f53d1c 100644
--- a/rules/joe.make
+++ b/rules/joe.make
@@ -107,28 +107,28 @@ joe_targetinstall: $(STATEDIR)/joe.targetinstall
 $(STATEDIR)/joe.targetinstall: $(joe_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,joe)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(JOE_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Oscar Peredo <oscar\@exis.cl>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(JOE_DIR)/joe, /bin/joe)
-	@$(call install_copy, 0, 0, 0755, $(JOE_DIR)/termidx, /bin/termidx)
-	@$(call install_copy, 0, 0, 0755, /etc/joe) 
-	@$(call install_copy, 0, 0, 0644, $(JOE_DIR)/joerc, /etc/joe/joerc,n)
-	@$(call install_copy, 0, 0, 0755, /etc/joe/syntax)
+	@$(call install_init, joe)
+	@$(call install_fixup, joe,PACKAGE,joe)
+	@$(call install_fixup, joe,PRIORITY,optional)
+	@$(call install_fixup, joe,VERSION,$(JOE_VERSION))
+	@$(call install_fixup, joe,SECTION,base)
+	@$(call install_fixup, joe,AUTHOR,"Oscar Peredo <oscar\@exis.cl>")
+	@$(call install_fixup, joe,DEPENDS,)
+	@$(call install_fixup, joe,DESCRIPTION,missing)
+
+	@$(call install_copy, joe, 0, 0, 0755, $(JOE_DIR)/joe, /bin/joe)
+	@$(call install_copy, joe, 0, 0, 0755, $(JOE_DIR)/termidx, /bin/termidx)
+	@$(call install_copy, joe, 0, 0, 0755, /etc/joe) 
+	@$(call install_copy, joe, 0, 0, 0644, $(JOE_DIR)/joerc, /etc/joe/joerc,n)
+	@$(call install_copy, joe, 0, 0, 0755, /etc/joe/syntax)
 
 	@for file in $(JOE_DIR)/syntax/*.jsf; do \
 		destination=`basename $$file`; \
 		echo "dst=$$destination"; \
-		$(call install_copy, 0, 0, 0644, $$file, /etc/joe/syntax/$$destination, n); \
+		$(call install_copy, joe, 0, 0, 0644, $$file, /etc/joe/syntax/$$destination, n); \
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, joe)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/jvisu.make b/rules/jvisu.make
index d304b9ebe..db6b2cecb 100644
--- a/rules/jvisu.make
+++ b/rules/jvisu.make
@@ -106,21 +106,21 @@ jvisu_targetinstall: $(STATEDIR)/jvisu.targetinstall
 $(STATEDIR)/jvisu.targetinstall: $(jvisu_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,jvisu)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(JVISU_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, jvisu)
+	@$(call install_fixup, jvisu,PACKAGE,jvisu)
+	@$(call install_fixup, jvisu,PRIORITY,optional)
+	@$(call install_fixup, jvisu,VERSION,$(JVISU_VERSION))
+	@$(call install_fixup, jvisu,SECTION,base)
+	@$(call install_fixup, jvisu,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, jvisu,DEPENDS,)
+	@$(call install_fixup, jvisu,DESCRIPTION,missing)
 
 ifdef PTXCONF_JVISU_APPLET
 	# User: www; Group: www
-	@$(call install_copy, 12, 102, 0644, $(JVISU_DIR)/jar/jvisu.jar, $(PTXCONF_JVISU_APPLET_PATH)/jvisu.jar, n)
+	@$(call install_copy, jvisu, 12, 102, 0644, $(JVISU_DIR)/jar/jvisu.jar, $(PTXCONF_JVISU_APPLET_PATH)/jvisu.jar, n)
 endif
 
-	@$(call install_finish)
+	@$(call install_finish, jvisu)
 
 	@$(call touch, $@)
 
diff --git a/rules/kernel.make b/rules/kernel.make
index 6ef53f05a..31a0d55dc 100644
--- a/rules/kernel.make
+++ b/rules/kernel.make
@@ -316,45 +316,45 @@ $(STATEDIR)/kernel.targetinstall: $(STATEDIR)/kernel.compile
 	@$(call targetinfo, $@)
 
 ifdef  PTXCONF_KERNEL_TARGET_INSTALL
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,kernel)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(KERNEL_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init,  kernel)
+	@$(call install_fixup, kernel, PACKAGE, kernel)
+	@$(call install_fixup, kernel, PRIORITY,optional)
+	@$(call install_fixup, kernel, VERSION,$(KERNEL_VERSION))
+	@$(call install_fixup, kernel, SECTION,base)
+	@$(call install_fixup, kernel, AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, kernel, DEPENDS,)
+	@$(call install_fixup, kernel, DESCRIPTION,missing)
 
 	for i in $(KERNEL_TARGET_PATH); do 				\
 		if [ -f $$i ]; then					\
-			$(call install_copy, 0, 0, 0644, $$i, /boot/$(KERNEL_TARGET), n)\
+			$(call install_copy, KERNEL, 0, 0, 0644, $$i, /boot/$(KERNEL_TARGET), n)\
 		fi;							\
 	done
-	@$(call install_finish)
+	@$(call install_finish, KERNEL)
 endif
 ifdef PTXCONF_KERNEL_TARGET_INSTALL_MODULES
 	rm -fr $(KERNEL_INST_DIR)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,kernel-modules)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(KERNEL_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init,  kernel)
+	@$(call install_fixup, kernel, PACKAGE,kernel-modules)
+	@$(call install_fixup, kernel, PRIORITY,optional)
+	@$(call install_fixup, kernel, VERSION,$(KERNEL_VERSION))
+	@$(call install_fixup, kernel, SECTION,base)
+	@$(call install_fixup, kernel, AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, kernel, DEPENDS,)
+	@$(call install_fixup, kernel, DESCRIPTION,missing)
 
 	cd $(KERNEL_DIR) && $(KERNEL_PATH) make 			\
 		modules_install $(KERNEL_MAKEVARS) INSTALL_MOD_PATH=$(KERNEL_INST_DIR)
 
 	cd $(KERNEL_INST_DIR) &&					\
 		for file in `find . -type f | sed -e "s/\.\//\//g"`; do	\
-			$(call install_copy, 0, 0, 0664, $(KERNEL_INST_DIR)/$$file, $$file, n) \
+			$(call install_copy, KERNEL, 0, 0, 0664, $(KERNEL_INST_DIR)/$$file, $$file, n) \
 		done
 
 	rm -fr $(KERNEL_INST_DIR)
 
-	@$(call install_finish)
+	@$(call install_finish, kernel)
 endif
 	@$(call touch, $@)
 
diff --git a/rules/libart.make b/rules/libart.make
index a39a12238..9ade3455d 100644
--- a/rules/libart.make
+++ b/rules/libart.make
@@ -106,23 +106,23 @@ libart_targetinstall: $(STATEDIR)/libart.targetinstall
 $(STATEDIR)/libart.targetinstall: $(libart_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,libart)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(LIBART_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_init, libart)
+	@$(call install_fixup, libart,PACKAGE,libart)
+	@$(call install_fixup, libart,PRIORITY,optional)
+	@$(call install_fixup, libart,VERSION,$(LIBART_VERSION))
+	@$(call install_fixup, libart,SECTION,base)
+	@$(call install_fixup, libart,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, libart,DEPENDS,)
+	@$(call install_fixup, libart,DESCRIPTION,missing)
+
+	@$(call install_copy, libart, 0, 0, 0644, \
 		$(LIBART_DIR)/.libs/libart_lgpl_2.so.2.3.16, \
 		/usr/lib/libart_lgpl_2.so.2.3.16)
-	@$(call install_link, libart_lgpl_2.so.2.3.16, /usr/lib/libart_lgpl_2.so.2.3)
-	@$(call install_link, libart_lgpl_2.so.2.3.16, /usr/lib/libart_lgpl_2.so.2)
-	@$(call install_link, libart_lgpl_2.so.2.3.16, /usr/lib/libart_lgpl_2.so)
+	@$(call install_link, libart, libart_lgpl_2.so.2.3.16, /usr/lib/libart_lgpl_2.so.2.3)
+	@$(call install_link, libart, libart_lgpl_2.so.2.3.16, /usr/lib/libart_lgpl_2.so.2)
+	@$(call install_link, libart, libart_lgpl_2.so.2.3.16, /usr/lib/libart_lgpl_2.so)
 
-	@$(call install_finish)
+	@$(call install_finish, libart)
 
 	@$(call touch, $@)
 
diff --git a/rules/libcgicc.make b/rules/libcgicc.make
index bbd253147..faa740b46 100644
--- a/rules/libcgicc.make
+++ b/rules/libcgicc.make
@@ -105,18 +105,18 @@ cgicc_targetinstall: $(STATEDIR)/cgicc.targetinstall
 $(STATEDIR)/cgicc.targetinstall: $(cgicc_targetinstall_deps_default)
 
 	@$(call targetinfo, $@)
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,cgicc)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(CGICC_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, cgicc)
+	@$(call install_fixup, cgicc,PACKAGE,cgicc)
+	@$(call install_fixup, cgicc,PRIORITY,optional)
+	@$(call install_fixup, cgicc,VERSION,$(CGICC_VERSION))
+	@$(call install_fixup, cgicc,SECTION,base)
+	@$(call install_fixup, cgicc,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, cgicc,DEPENDS,)
+	@$(call install_fixup, cgicc,DESCRIPTION,missing)
 
 	@$(call copy_lib_root, libcgicc.so.1, /usr/lib)
 
-	@$(call install_finish)
+	@$(call install_finish, cgicc)
 
 	@$(call touch, $@)
 
diff --git a/rules/libdrm.make b/rules/libdrm.make
index a704f2d73..d41962473 100644
--- a/rules/libdrm.make
+++ b/rules/libdrm.make
@@ -106,18 +106,18 @@ libdrm_targetinstall: $(STATEDIR)/libdrm.targetinstall
 $(STATEDIR)/libdrm.targetinstall: $(libdrm_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,libdrm)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(LIBDRM_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, libdrm)
+	@$(call install_fixup, libdrm,PACKAGE,libdrm)
+	@$(call install_fixup, libdrm,PRIORITY,optional)
+	@$(call install_fixup, libdrm,VERSION,$(LIBDRM_VERSION))
+	@$(call install_fixup, libdrm,SECTION,base)
+	@$(call install_fixup, libdrm,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, libdrm,DEPENDS,)
+	@$(call install_fixup, libdrm,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, libdrm)
 
 	@$(call touch, $@)
 
diff --git a/rules/libgnomecanvas.make b/rules/libgnomecanvas.make
index 75d7efbcb..35225f013 100644
--- a/rules/libgnomecanvas.make
+++ b/rules/libgnomecanvas.make
@@ -107,22 +107,22 @@ libgnomecanvas_targetinstall: $(STATEDIR)/libgnomecanvas.targetinstall
 $(STATEDIR)/libgnomecanvas.targetinstall: $(libgnomecanvas_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,libgnomecanvas)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(LIBGNOMECANVAS_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_init, libgnomecanvas)
+	@$(call install_fixup, libgnomecanvas,PACKAGE,libgnomecanvas)
+	@$(call install_fixup, libgnomecanvas,PRIORITY,optional)
+	@$(call install_fixup, libgnomecanvas,VERSION,$(LIBGNOMECANVAS_VERSION))
+	@$(call install_fixup, libgnomecanvas,SECTION,base)
+	@$(call install_fixup, libgnomecanvas,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, libgnomecanvas,DEPENDS,)
+	@$(call install_fixup, libgnomecanvas,DESCRIPTION,missing)
+
+	@$(call install_copy, libgnomecanvas, 0, 0, 0644, \
 		$(LIBGNOMECANVAS_DIR)/libgnomecanvas/.libs/libgnomecanvas-2.so.0.590.0, \
 		/usr/lib/libgnomecanvas-2.so.0.590.0)
-	@$(call install_link, libgnomecanvas-2.so.0.590.0, /usr/lib/libgnomecanvas-2.so.0)
-	@$(call install_link, libgnomecanvas-2.so.0.590.0, /usr/lib/libgnomecanvas-2.so)
+	@$(call install_link, libgnomecanvas, libgnomecanvas-2.so.0.590.0, /usr/lib/libgnomecanvas-2.so.0)
+	@$(call install_link, libgnomecanvas, libgnomecanvas-2.so.0.590.0, /usr/lib/libgnomecanvas-2.so)
 
-	@$(call install_finish)
+	@$(call install_finish, libgnomecanvas)
 
 	@$(call touch, $@)
 
diff --git a/rules/libgsloop.make b/rules/libgsloop.make
index dd9e1927b..aeac968df 100644
--- a/rules/libgsloop.make
+++ b/rules/libgsloop.make
@@ -106,20 +106,20 @@ libgsloop_targetinstall: $(STATEDIR)/libgsloop.targetinstall
 $(STATEDIR)/libgsloop.targetinstall: $(libgsloop_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,libgsloop)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(LIBGSLOOP_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, $(LIBGSLOOP_DIR)/src/.libs/libgsloop.so.1.1.0, /usr/lib/libgsloop.so.1.1.0)
-	@$(call install_link, libgsloop.so.1.1.0, /usr/lib/libgsloop.so.1)
-	@$(call install_link, libgsloop.so.1.1.0, /usr/lib/libgsloop.so)
-
-	@$(call install_finish)
+	@$(call install_init, libgsloop)
+	@$(call install_fixup, libgsloop,PACKAGE,libgsloop)
+	@$(call install_fixup, libgsloop,PRIORITY,optional)
+	@$(call install_fixup, libgsloop,VERSION,$(LIBGSLOOP_VERSION))
+	@$(call install_fixup, libgsloop,SECTION,base)
+	@$(call install_fixup, libgsloop,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, libgsloop,DEPENDS,)
+	@$(call install_fixup, libgsloop,DESCRIPTION,missing)
+
+	@$(call install_copy, libgsloop, 0, 0, 0644, $(LIBGSLOOP_DIR)/src/.libs/libgsloop.so.1.1.0, /usr/lib/libgsloop.so.1.1.0)
+	@$(call install_link, libgsloop, libgsloop.so.1.1.0, /usr/lib/libgsloop.so.1)
+	@$(call install_link, libgsloop, libgsloop.so.1.1.0, /usr/lib/libgsloop.so)
+
+	@$(call install_finish, libgsloop)
 
 	@$(call touch, $@)
 
diff --git a/rules/liblist.make b/rules/liblist.make
index 623279931..9f46d0bd4 100644
--- a/rules/liblist.make
+++ b/rules/liblist.make
@@ -106,20 +106,20 @@ liblist_targetinstall: $(STATEDIR)/liblist.targetinstall
 $(STATEDIR)/liblist.targetinstall: $(liblist_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,liblist)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(LIBLIST_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, $(LIBLIST_DIR)/src/.libs/libptxlist.so.0.0.0, /usr/lib/libptxlist.so.0.0.0)
-	@$(call install_link, libptxlist.so.0.0.0, /usr/lib/libptxlist.so.0)
-	@$(call install_link, libptxlist.so.0.0.0, /usr/lib/libptxlist.so)
-
-	@$(call install_finish)
+	@$(call install_init, liblist)
+	@$(call install_fixup, liblist,PACKAGE,liblist)
+	@$(call install_fixup, liblist,PRIORITY,optional)
+	@$(call install_fixup, liblist,VERSION,$(LIBLIST_VERSION))
+	@$(call install_fixup, liblist,SECTION,base)
+	@$(call install_fixup, liblist,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, liblist,DEPENDS,)
+	@$(call install_fixup, liblist,DESCRIPTION,missing)
+
+	@$(call install_copy, liblist, 0, 0, 0644, $(LIBLIST_DIR)/src/.libs/libptxlist.so.0.0.0, /usr/lib/libptxlist.so.0.0.0)
+	@$(call install_link, liblist, libptxlist.so.0.0.0, /usr/lib/libptxlist.so.0)
+	@$(call install_link, liblist, libptxlist.so.0.0.0, /usr/lib/libptxlist.so)
+
+	@$(call install_finish, liblist)
 
 	@$(call touch, $@)
 
diff --git a/rules/liblockfile.make b/rules/liblockfile.make
index a9205872f..b6bc27e38 100644
--- a/rules/liblockfile.make
+++ b/rules/liblockfile.make
@@ -106,18 +106,18 @@ liblockfile_targetinstall: $(STATEDIR)/liblockfile.targetinstall
 $(STATEDIR)/liblockfile.targetinstall: $(liblockfile_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,liblockfile)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(LIBLOCKFILE_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Bjoern Buerger <b.buerger\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(LIBLOCKFILE_DIR)/dotlockfile, /usr/bin/dotlockfile)
-
-	@$(call install_finish)
+	@$(call install_init, liblockfile)
+	@$(call install_fixup, liblockfile,PACKAGE,liblockfile)
+	@$(call install_fixup, liblockfile,PRIORITY,optional)
+	@$(call install_fixup, liblockfile,VERSION,$(LIBLOCKFILE_VERSION))
+	@$(call install_fixup, liblockfile,SECTION,base)
+	@$(call install_fixup, liblockfile,AUTHOR,"Bjoern Buerger <b.buerger\@pengutronix.de>")
+	@$(call install_fixup, liblockfile,DEPENDS,)
+	@$(call install_fixup, liblockfile,DESCRIPTION,missing)
+
+	@$(call install_copy, liblockfile, 0, 0, 0755, $(LIBLOCKFILE_DIR)/dotlockfile, /usr/bin/dotlockfile)
+
+	@$(call install_finish, liblockfile)
 
 	@$(call touch, $@)
 
diff --git a/rules/libmodbus.make b/rules/libmodbus.make
index 543045656..f3004fe34 100644
--- a/rules/libmodbus.make
+++ b/rules/libmodbus.make
@@ -106,23 +106,23 @@ libmodbus_targetinstall: $(STATEDIR)/libmodbus.targetinstall
 $(STATEDIR)/libmodbus.targetinstall: $(libmodbus_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,libmodbus)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(LIBMODBUS_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_init, libmodbus)
+	@$(call install_fixup, libmodbus,PACKAGE,libmodbus)
+	@$(call install_fixup, libmodbus,PRIORITY,optional)
+	@$(call install_fixup, libmodbus,VERSION,$(LIBMODBUS_VERSION))
+	@$(call install_fixup, libmodbus,SECTION,base)
+	@$(call install_fixup, libmodbus,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, libmodbus,DEPENDS,)
+	@$(call install_fixup, libmodbus,DESCRIPTION,missing)
+
+	@$(call install_copy, libmodbus, 0, 0, 0644, \
 		$(LIBMODBUS_DIR)/src/.libs/libmodbus.so.0.0.0, \
 		/usr/lib/libmodbus.so.0.0.0, y)
 
-	@$(call install_link, libmodbus.so.0.0.0, /usr/lib/libmodbus.so.0)
-	@$(call install_link, libmodbus.so.0.0.0, /usr/lib/libmodbus.so)
+	@$(call install_link, libmodbus, libmodbus.so.0.0.0, /usr/lib/libmodbus.so.0)
+	@$(call install_link, libmodbus, libmodbus.so.0.0.0, /usr/lib/libmodbus.so)
 
-	@$(call install_finish)
+	@$(call install_finish, libmodbus)
 
 	@$(call touch, $@)
 
diff --git a/rules/libmqueue.make b/rules/libmqueue.make
index 93c7b35dc..33db5dde9 100644
--- a/rules/libmqueue.make
+++ b/rules/libmqueue.make
@@ -107,23 +107,23 @@ libmqueue_targetinstall: $(STATEDIR)/libmqueue.targetinstall
 $(STATEDIR)/libmqueue.targetinstall: $(libmqueue_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,libmqueue)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(LIBMQUEUE_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_init, libmqueue)
+	@$(call install_fixup, libmqueue,PACKAGE,libmqueue)
+	@$(call install_fixup, libmqueue,PRIORITY,optional)
+	@$(call install_fixup, libmqueue,VERSION,$(LIBMQUEUE_VERSION))
+	@$(call install_fixup, libmqueue,SECTION,base)
+	@$(call install_fixup, libmqueue,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, libmqueue,DEPENDS,)
+	@$(call install_fixup, libmqueue,DESCRIPTION,missing)
+
+	@$(call install_copy, libmqueue, 0, 0, 0755, \
 		$(LIBMQUEUE_DIR)/src/.libs/libmqueue.so.4.0.41, \
 		/usr/lib/libmqueue.so.4.0.41)
 
-	@$(call install_link, libmqueue.so.4.0.41, /usr/lib/libmqueue.so.4)
-	@$(call install_link, libmqueue.so.4.0.41, /usr/lib/libmqueue.so)
+	@$(call install_link, libmqueue, libmqueue.so.4.0.41, /usr/lib/libmqueue.so.4)
+	@$(call install_link, libmqueue, libmqueue.so.4.0.41, /usr/lib/libmqueue.so)
 
-	@$(call install_finish)
+	@$(call install_finish, libmqueue)
 
 	@$(call touch, $@)
 
diff --git a/rules/libnetpbm.make b/rules/libnetpbm.make
index a53c31911..052685af3 100644
--- a/rules/libnetpbm.make
+++ b/rules/libnetpbm.make
@@ -113,23 +113,23 @@ libnetpbm_targetinstall: $(STATEDIR)/libnetpbm.targetinstall
 $(STATEDIR)/libnetpbm.targetinstall: $(libnetpbm_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,libnetpbm)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(LIBNETPBM_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_init, libnetpbm)
+	@$(call install_fixup, libnetpbm,PACKAGE,libnetpbm)
+	@$(call install_fixup, libnetpbm,PRIORITY,optional)
+	@$(call install_fixup, libnetpbm,VERSION,$(LIBNETPBM_VERSION))
+	@$(call install_fixup, libnetpbm,SECTION,base)
+	@$(call install_fixup, libnetpbm,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, libnetpbm,DEPENDS,)
+	@$(call install_fixup, libnetpbm,DESCRIPTION,missing)
+
+	@$(call install_copy, libnetpbm, 0, 0, 0644, \
 		$(LIBNETPBM_DIR)/lib/libnetpbm.so.10.31, \
 		/usr/lib/libnetpbm.so.10.31)
 
-	@$(call install_link, libnetpbm.so.10.31, /usr/lib/libnetpbm.so.10)
-	@$(call install_link, libnetpbm.so.10.31, /usr/lib/libnetpbm.so)
+	@$(call install_link, libnetpbm, libnetpbm.so.10.31, /usr/lib/libnetpbm.so.10)
+	@$(call install_link, libnetpbm, libnetpbm.so.10.31, /usr/lib/libnetpbm.so)
 
-	@$(call install_finish)
+	@$(call install_finish, libnetpbm)
 
 	@$(call touch, $@)
 
diff --git a/rules/liboop.make b/rules/liboop.make
index 04f855c71..3a5a680bf 100644
--- a/rules/liboop.make
+++ b/rules/liboop.make
@@ -114,23 +114,23 @@ liboop_targetinstall: $(STATEDIR)/liboop.targetinstall
 $(STATEDIR)/liboop.targetinstall: $(liboop_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,liboop)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(LIBOOP_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_init, liboop)
+	@$(call install_fixup, liboop,PACKAGE,liboop)
+	@$(call install_fixup, liboop,PRIORITY,optional)
+	@$(call install_fixup, liboop,VERSION,$(LIBOOP_VERSION))
+	@$(call install_fixup, liboop,SECTION,base)
+	@$(call install_fixup, liboop,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, liboop,DEPENDS,)
+	@$(call install_fixup, liboop,DESCRIPTION,missing)
+
+	@$(call install_copy, liboop, 0, 0, 0644, \
 		$(LIBOOP_DIR)/.libs/liboop.so.4.0.1, \
 		/usr/lib/liboop.so.4.0.1)
 
-	@$(call install_link, liboop.so.4.0.1, /usr/lib/liboop.so.4)
-	@$(call install_link, liboop.so.4.0.1, /usr/lib/liboop.so)
+	@$(call install_link, liboop, liboop.so.4.0.1, /usr/lib/liboop.so.4)
+	@$(call install_link, liboop, liboop.so.4.0.1, /usr/lib/liboop.so)
 
-	@$(call install_finish)
+	@$(call install_finish, liboop)
 
 	@$(call touch, $@)
 
diff --git a/rules/libpng.make b/rules/libpng.make
index eae768202..f8f47963c 100644
--- a/rules/libpng.make
+++ b/rules/libpng.make
@@ -105,28 +105,28 @@ libpng_targetinstall: $(STATEDIR)/libpng.targetinstall
 $(STATEDIR)/libpng.targetinstall: $(libpng_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,libpng)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(LIBPNG_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_init, libpng)
+	@$(call install_fixup, libpng,PACKAGE,libpng)
+	@$(call install_fixup, libpng,PRIORITY,optional)
+	@$(call install_fixup, libpng,VERSION,$(LIBPNG_VERSION))
+	@$(call install_fixup, libpng,SECTION,base)
+	@$(call install_fixup, libpng,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, libpng,DEPENDS,)
+	@$(call install_fixup, libpng,DESCRIPTION,missing)
+
+	@$(call install_copy, libpng, 0, 0, 0644, \
 		$(LIBPNG_DIR)/.libs/libpng12.so.0.0.0, \
 		/usr/lib/libpng12.so.0.0.0)
-	@$(call install_link, libpng12.so.0.0.0, /usr/lib/libpng12.so.0.0)
-	@$(call install_link, libpng12.so.0.0.0, /usr/lib/libpng12.so.0)
+	@$(call install_link, libpng, libpng12.so.0.0.0, /usr/lib/libpng12.so.0.0)
+	@$(call install_link, libpng, libpng12.so.0.0.0, /usr/lib/libpng12.so.0)
 
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, libpng, 0, 0, 0644, \
 		$(LIBPNG_DIR)/.libs/libpng.so.3.0.0, \
 		/usr/lib/libpng.so.3.0.0)
-	@$(call install_link, libpng.so.3.0.0, /usr/lib/libpng.so.3.0)
-	@$(call install_link, libpng.so.3.0.0, /usr/lib/libpng.so.3)
+	@$(call install_link, libpng, libpng.so.3.0.0, /usr/lib/libpng.so.3.0)
+	@$(call install_link, libpng, libpng.so.3.0.0, /usr/lib/libpng.so.3)
 
-	@$(call install_finish)
+	@$(call install_finish, libpng)
 
 	@$(call touch, $@)
 
diff --git a/rules/libpv.make b/rules/libpv.make
index c1ba73746..ae5d64767 100644
--- a/rules/libpv.make
+++ b/rules/libpv.make
@@ -113,27 +113,27 @@ libpv_targetinstall: $(STATEDIR)/libpv.targetinstall
 $(STATEDIR)/libpv.targetinstall: $(libpv_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,libpv)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(LIBPV_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, libpv)
+	@$(call install_fixup, libpv,PACKAGE,libpv)
+	@$(call install_fixup, libpv,PRIORITY,optional)
+	@$(call install_fixup, libpv,VERSION,$(LIBPV_VERSION))
+	@$(call install_fixup, libpv,SECTION,base)
+	@$(call install_fixup, libpv,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, libpv,DEPENDS,)
+	@$(call install_fixup, libpv,DESCRIPTION,missing)
 
 ifdef PTXCONF_LIBPV_PVTOOL
-	@$(call install_copy, 0, 0, 0755, $(LIBPV_DIR)/src/.libs/pvtool, /usr/bin/pvtool)
+	@$(call install_copy, libpv, 0, 0, 0755, $(LIBPV_DIR)/src/.libs/pvtool, /usr/bin/pvtool)
 endif
 
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, libpv, 0, 0, 0644, \
 		$(LIBPV_DIR)/src/.libs/libpv.so.8.1.0, \
 		/usr/lib/libpv.so.8.1.0)
 
-	@$(call install_link, libpv.so.8.1.0, /usr/lib/libpv.so.8)
-	@$(call install_link, libpv.so.8.1.0, /usr/lib/libpv.so)
+	@$(call install_link, libpv, libpv.so.8.1.0, /usr/lib/libpv.so.8)
+	@$(call install_link, libpv, libpv.so.8.1.0, /usr/lib/libpv.so)
 
-	@$(call install_finish)
+	@$(call install_finish, libpv)
 
 	@$(call touch, $@)
 
diff --git a/rules/librn.make b/rules/librn.make
index 2ddd859ef..748368035 100644
--- a/rules/librn.make
+++ b/rules/librn.make
@@ -109,20 +109,20 @@ librn_targetinstall: $(STATEDIR)/librn.targetinstall
 $(STATEDIR)/librn.targetinstall: $(librn_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,librn)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(LIBRN_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, $(LIBRN_DIR)/src/.libs/librn.so.0.1.1, /usr/lib/librn.so.0.1.1)
-	@$(call install_link, librn.so.0.1.1, /usr/lib/librn.so.0)
-	@$(call install_link, librn.so.0.1.1, /usr/lib/librn.so)
-
-	@$(call install_finish)
+	@$(call install_init, librn)
+	@$(call install_fixup, librn,PACKAGE,librn)
+	@$(call install_fixup, librn,PRIORITY,optional)
+	@$(call install_fixup, librn,VERSION,$(LIBRN_VERSION))
+	@$(call install_fixup, librn,SECTION,base)
+	@$(call install_fixup, librn,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, librn,DEPENDS,)
+	@$(call install_fixup, librn,DESCRIPTION,missing)
+
+	@$(call install_copy, librn, 0, 0, 0644, $(LIBRN_DIR)/src/.libs/librn.so.0.1.1, /usr/lib/librn.so.0.1.1)
+	@$(call install_link, librn, librn.so.0.1.1, /usr/lib/librn.so.0)
+	@$(call install_link, librn, librn.so.0.1.1, /usr/lib/librn.so)
+
+	@$(call install_finish, librn)
 
 	@$(call touch, $@)
 
diff --git a/rules/libxml2.make b/rules/libxml2.make
index de40aa729..470f7c979 100644
--- a/rules/libxml2.make
+++ b/rules/libxml2.make
@@ -306,22 +306,22 @@ libxml2_targetinstall: $(STATEDIR)/libxml2.targetinstall
 $(STATEDIR)/libxml2.targetinstall: $(libxml2_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,libxml2)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(LIBXML2_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_init, libxml2)
+	@$(call install_fixup, libxml2,PACKAGE,libxml2)
+	@$(call install_fixup, libxml2,PRIORITY,optional)
+	@$(call install_fixup, libxml2,VERSION,$(LIBXML2_VERSION))
+	@$(call install_fixup, libxml2,SECTION,base)
+	@$(call install_fixup, libxml2,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, libxml2,DEPENDS,)
+	@$(call install_fixup, libxml2,DESCRIPTION,missing)
+
+	@$(call install_copy, libxml2, 0, 0, 0644, \
 		$(LIBXML2_DIR)/.libs/libxml2.so.2.6.19, \
 		/usr/lib/libxml2.so.2.6.19)
-	@$(call install_link, libxml2.so.2.6.19, /usr/lib/libxml2.so.2)
-	@$(call install_link, libxml2.so.2.6.19, /usr/lib/libxml2.so)
+	@$(call install_link, libxml2, libxml2.so.2.6.19, /usr/lib/libxml2.so.2)
+	@$(call install_link, libxml2, libxml2.so.2.6.19, /usr/lib/libxml2.so)
 
-	@$(call install_finish)
+	@$(call install_finish, libxml2)
 
 	@$(call touch, $@)
 
diff --git a/rules/libxmlconfig.make b/rules/libxmlconfig.make
index 6ffc885a7..c83b114fc 100644
--- a/rules/libxmlconfig.make
+++ b/rules/libxmlconfig.make
@@ -106,20 +106,20 @@ libxmlconfig_targetinstall: $(STATEDIR)/libxmlconfig.targetinstall
 $(STATEDIR)/libxmlconfig.targetinstall: $(libxmlconfig_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,libxmlconfig)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(LIBXMLCONFIG_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, $(LIBXMLCONFIG_DIR)/.libs/libxmlconfig.so.0.0.0, /usr/lib/libxmlconfig.so.0.0.0)
-	@$(call install_link, libxmlconfig.so.0.0.0, /usr/lib/libxmlconfig.so.0)
-	@$(call install_link, libxmlconfig.so.0.0.0, /usr/lib/libxmlconfig.so)
-
-	@$(call install_finish)
+	@$(call install_init, libxmlconfig)
+	@$(call install_fixup, libxmlconfig,PACKAGE,libxmlconfig)
+	@$(call install_fixup, libxmlconfig,PRIORITY,optional)
+	@$(call install_fixup, libxmlconfig,VERSION,$(LIBXMLCONFIG_VERSION))
+	@$(call install_fixup, libxmlconfig,SECTION,base)
+	@$(call install_fixup, libxmlconfig,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, libxmlconfig,DEPENDS,)
+	@$(call install_fixup, libxmlconfig,DESCRIPTION,missing)
+
+	@$(call install_copy, libxmlconfig, 0, 0, 0644, $(LIBXMLCONFIG_DIR)/.libs/libxmlconfig.so.0.0.0, /usr/lib/libxmlconfig.so.0.0.0)
+	@$(call install_link, libxmlconfig, libxmlconfig.so.0.0.0, /usr/lib/libxmlconfig.so.0)
+	@$(call install_link, libxmlconfig, libxmlconfig.so.0.0.0, /usr/lib/libxmlconfig.so)
+
+	@$(call install_finish, libxmlconfig)
 
 	@$(call touch, $@)
 
diff --git a/rules/libxslt.make b/rules/libxslt.make
index f52d5bf07..e6cf908e3 100644
--- a/rules/libxslt.make
+++ b/rules/libxslt.make
@@ -136,38 +136,38 @@ libxslt_targetinstall: $(STATEDIR)/libxslt.targetinstall
 $(STATEDIR)/libxslt.targetinstall: $(libxslt_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,libxslt)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(LIBXSLT_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, libxslt)
+	@$(call install_fixup, libxslt,PACKAGE,libxslt)
+	@$(call install_fixup, libxslt,PRIORITY,optional)
+	@$(call install_fixup, libxslt,VERSION,$(LIBXSLT_VERSION))
+	@$(call install_fixup, libxslt,SECTION,base)
+	@$(call install_fixup, libxslt,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, libxslt,DEPENDS,)
+	@$(call install_fixup, libxslt,DESCRIPTION,missing)
 
 ifdef PTXCONF_LIBXSLT_LIBXSLT
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, libxslt, 0, 0, 0644, \
 		$(LIBXSLT_DIR)/libxslt/.libs/libxslt.so.1.1.14, \
 		/usr/lib/libxslt.so.1.1.14)
-	@$(call install_link, libxslt.so.1.1.14, /usr/lib/libxslt.so.1)
-	@$(call install_link, libxslt.so.1.1.14, /usr/lib/libxslt.so)
+	@$(call install_link, libxslt, libxslt.so.1.1.14, /usr/lib/libxslt.so.1)
+	@$(call install_link, libxslt, libxslt.so.1.1.14, /usr/lib/libxslt.so)
 endif
 
 ifdef PTXCONF_LIBXSLT_LIBEXSLT
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, libxslt, 0, 0, 0644, \
 		$(LIBXSLT_DIR)/libexslt/.libs/libexslt.so.0.8.12, \
 		/usr/lib/libexslt.so.0.8.12)
-	@$(call install_link, libexslt.so.0.8.12, /usr/lib/libexslt.so.0)
-	@$(call install_link, libexslt.so.0.8.12, /usr/lib/libexslt.so)
+	@$(call install_link, libxslt, libexslt.so.0.8.12, /usr/lib/libexslt.so.0)
+	@$(call install_link, libxslt, libexslt.so.0.8.12, /usr/lib/libexslt.so)
 endif
 
 ifdef PTXCONF_LIBXSLT_XSLTPROC
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, libxslt, 0, 0, 0755, \
 		$(LIBXSLT_DIR)/xsltproc/.libs/xsltproc, \
 		/usr/bin/xsltproc)
 endif
 
-	@$(call install_finish)
+	@$(call install_finish, libxslt)
 
 	@$(call touch, $@)
 
diff --git a/rules/lrzsz.make b/rules/lrzsz.make
index 25212511b..67b37fccb 100644
--- a/rules/lrzsz.make
+++ b/rules/lrzsz.make
@@ -107,19 +107,19 @@ lrzsz_targetinstall: $(STATEDIR)/lrzsz.targetinstall
 $(STATEDIR)/lrzsz.targetinstall: $(lrzsz_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,lrzsz)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(LRZSZ_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(LRZSZ_DIR)/src/lrz, /usr/sbin/lrz)
-	@$(call install_copy, 0, 0, 0755, $(LRZSZ_DIR)/src/lsz, /usr/sbin/lsz)
-
-	@$(call install_finish)
+	@$(call install_init, lrzsz)
+	@$(call install_fixup, lrzsz,PACKAGE,lrzsz)
+	@$(call install_fixup, lrzsz,PRIORITY,optional)
+	@$(call install_fixup, lrzsz,VERSION,$(LRZSZ_VERSION))
+	@$(call install_fixup, lrzsz,SECTION,base)
+	@$(call install_fixup, lrzsz,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, lrzsz,DEPENDS,)
+	@$(call install_fixup, lrzsz,DESCRIPTION,missing)
+
+	@$(call install_copy, lrzsz, 0, 0, 0755, $(LRZSZ_DIR)/src/lrz, /usr/sbin/lrz)
+	@$(call install_copy, lrzsz, 0, 0, 0755, $(LRZSZ_DIR)/src/lsz, /usr/sbin/lsz)
+
+	@$(call install_finish, lrzsz)
 
 	@$(call touch, $@)
 
diff --git a/rules/lsh.make b/rules/lsh.make
index 3b7687657..5280271f0 100644
--- a/rules/lsh.make
+++ b/rules/lsh.make
@@ -116,34 +116,34 @@ lsh_targetinstall: $(STATEDIR)/lsh.targetinstall
 $(STATEDIR)/lsh.targetinstall: $(lsh_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,lsh)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(LSH_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, lsh)
+	@$(call install_fixup, lsh,PACKAGE,lsh)
+	@$(call install_fixup, lsh,PRIORITY,optional)
+	@$(call install_fixup, lsh,VERSION,$(LSH_VERSION))
+	@$(call install_fixup, lsh,SECTION,base)
+	@$(call install_fixup, lsh,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, lsh,DEPENDS,)
+	@$(call install_fixup, lsh,DESCRIPTION,missing)
 
 ifdef PTXCONF_LSH_EXECUV
-	@$(call install_copy, 0, 0, 0755, $(LSH_DIR)/src/lsh-execuv, /sbin/lsh-execuv)
+	@$(call install_copy, lsh, 0, 0, 0755, $(LSH_DIR)/src/lsh-execuv, /sbin/lsh-execuv)
 endif
 ifdef PTXCONF_LSH_LSHD
-	@$(call install_copy, 0, 0, 0755, $(LSH_DIR)/src/lshd, /sbin/lshd)
+	@$(call install_copy, lsh, 0, 0, 0755, $(LSH_DIR)/src/lshd, /sbin/lshd)
 endif
 ifdef PTXCONF_LSH_SFTPD
-	@$(call install_copy, 0, 0, 0755, $(LSH_DIR)/src/sftp/sftp-server, /sbin/sftp-server)
+	@$(call install_copy, lsh, 0, 0, 0755, $(LSH_DIR)/src/sftp/sftp-server, /sbin/sftp-server)
 endif
 ifdef PTXCONF_LSH_MAKESEED
-	@$(call install_copy, 0, 0, 0755, $(LSH_DIR)/src/lsh-make-seed, /bin/lsh-make-seed)
+	@$(call install_copy, lsh, 0, 0, 0755, $(LSH_DIR)/src/lsh-make-seed, /bin/lsh-make-seed)
 endif
 ifdef PTXCONF_LSH_WRITEKEY
-	@$(call install_copy, 0, 0, 0755, $(LSH_DIR)/src/lsh-writekey, /sbin/lsh-writekey)
+	@$(call install_copy, lsh, 0, 0, 0755, $(LSH_DIR)/src/lsh-writekey, /sbin/lsh-writekey)
 endif
 ifdef PTXCONF_LSH_KEYGEN
-	@$(call install_copy, 0, 0, 0755, $(LSH_DIR)/src/lsh-keygen, /sbin/lsh-keygen)
+	@$(call install_copy, lsh, 0, 0, 0755, $(LSH_DIR)/src/lsh-keygen, /sbin/lsh-keygen)
 endif
-	@$(call install_finish)
+	@$(call install_finish, lsh)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/ltp.make b/rules/ltp.make
index 986318946..511d4123b 100644
--- a/rules/ltp.make
+++ b/rules/ltp.make
@@ -103,152 +103,152 @@ ltp_targetinstall: $(STATEDIR)/ltp.targetinstall
 $(STATEDIR)/ltp.targetinstall: $(ltp_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,ltp)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(LTP_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, ltp)
+	@$(call install_fixup, ltp,PACKAGE,ltp)
+	@$(call install_fixup, ltp,PRIORITY,optional)
+	@$(call install_fixup, ltp,VERSION,$(LTP_VERSION))
+	@$(call install_fixup, ltp,SECTION,base)
+	@$(call install_fixup, ltp,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, ltp,DEPENDS,)
+	@$(call install_fixup, ltp,DESCRIPTION,missing)
 
 ifdef PTXCONF_LTP_MISC_MATH_ABS
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/abs/abs01, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/abs/abs01)
 endif
 ifdef PTXCONF_LTP_MISC_MATH_ATOF
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/atof/atof01, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/atof/atof01)
 endif
 ifdef PTXCONF_LTP_MISC_MATH_FLOAT
 	# Bessel
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/float_bessel, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/bessel/float_bessel)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/bessel/genbessel, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/bessel/genbessel)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/bessel/genlgamma, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/bessel/genlgamma)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/bessel/genj0, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/bessel/genj0)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/bessel/genj1, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/bessel/genj1)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/bessel/geny0, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/bessel/geny0)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/bessel/geny1, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/bessel/geny1)
 
 	# exp_log
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/float_exp_log, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/exp_log/float_exp_log)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/exp_log/genexp, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/exp_log/gen_exp)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/exp_log/genexp_log, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/exp_log/genexp_log)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/exp_log/genfrexp, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/exp_log/genfrexp)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/exp_log/genhypot, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/exp_log/genhypot)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/exp_log/genldexp, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/exp_log/genldexp)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/exp_log/genlog, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/exp_log/genlog)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/exp_log/genlog10, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/exp_log/genlog10)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/exp_log/genmodf, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/exp_log/genmodf)
 
 	# iperb
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/float_iperb, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/iperb/float_iperb)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/iperb/gencosh, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/iperb/gencosh)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/iperb/geniperb, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/iperb/geniperb)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/iperb/gensinh, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/iperb/gensinh)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/iperb/gentanh, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/iperb/gentanh)
 
 	# power
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/float_power, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/power/float_power)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/power/genceil, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/power/genceil)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/power/genfabs, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/power/genfabs)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/power/genfloor, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/power/genfloor)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/power/genfmod, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/power/genfmod)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/power/genpow, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/power/genpow)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/power/genpower, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/power/genpower)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/power/gensqrt, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/power/gensqrt)
 
 	# trigo
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/float_trigo, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/trigo/float_trigo)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/trigo/genacos, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/trigo/genacos)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/trigo/genasin, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/trigo/genasin)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/trigo/genatan, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/trigo/genatan)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/trigo/genatan2, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/trigo/genatan2)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/trigo/gencos, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/trigo/gencos)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/trigo/gensin, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/trigo/gensin)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/trigo/gentan, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/trigo/gentan)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltp, 0, 0, 0755, \
 		$(LTP_DIR)/testcases/misc/math/float/trigo/gentrigo, \
 		$(PTXCONF_TESTSUITE_DIR)/$(LTP)/misc/math/float/trigo/gentrigo)
 endif
 
-	@$(call install_finish)
+	@$(call install_finish, ltp)
 
 	@$(call touch, $@)
 
diff --git a/rules/ltt.make b/rules/ltt.make
index 7f8a0b99d..d8e47df28 100644
--- a/rules/ltt.make
+++ b/rules/ltt.make
@@ -111,28 +111,28 @@ ltt_targetinstall: $(STATEDIR)/ltt.targetinstall
 $(STATEDIR)/ltt.targetinstall: $(ltt_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,ltt)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(LTT_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_init, ltt)
+	@$(call install_fixup, ltt,PACKAGE,ltt)
+	@$(call install_fixup, ltt,PRIORITY,optional)
+	@$(call install_fixup, ltt,VERSION,$(LTT_VERSION))
+	@$(call install_fixup, ltt,SECTION,base)
+	@$(call install_fixup, ltt,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, ltt,DEPENDS,)
+	@$(call install_fixup, ltt,DESCRIPTION,missing)
+
+	@$(call install_copy, ltt, 0, 0, 0755, \
 		$(LTT_BUILDDIR)/Daemon/tracedaemon, \
 		/usr/sbin/tracedaemon)
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, ltt, 0, 0, 0755, \
 		$(LTT_DIR)/createdev.sh, \
 		/usr/sbin/tracecreatedev, n)
 
-	@$(call install_copy, 0, 0, 0755, $(LTT_DIR)/Daemon/Scripts/trace, /usr/sbin/trace, n)
-	@$(call install_copy, 0, 0, 0755, $(LTT_DIR)/Daemon/Scripts/tracecore, /usr/sbin/tracecore, n)
-	@$(call install_copy, 0, 0, 0755, $(LTT_DIR)/Daemon/Scripts/tracecpuid, /usr/sbin/tracecpuid, n)
-	@$(call install_copy, 0, 0, 0755, $(LTT_DIR)/Daemon/Scripts/traceu, /usr/sbin/traceu, n)
+	@$(call install_copy, ltt, 0, 0, 0755, $(LTT_DIR)/Daemon/Scripts/trace, /usr/sbin/trace, n)
+	@$(call install_copy, ltt, 0, 0, 0755, $(LTT_DIR)/Daemon/Scripts/tracecore, /usr/sbin/tracecore, n)
+	@$(call install_copy, ltt, 0, 0, 0755, $(LTT_DIR)/Daemon/Scripts/tracecpuid, /usr/sbin/tracecpuid, n)
+	@$(call install_copy, ltt, 0, 0, 0755, $(LTT_DIR)/Daemon/Scripts/traceu, /usr/sbin/traceu, n)
 
-	@$(call install_finish)
+	@$(call install_finish, ltt)
 
 	@$(call touch, $@)
 
diff --git a/rules/mad.make b/rules/mad.make
index dba0997f1..16f15ecb7 100644
--- a/rules/mad.make
+++ b/rules/mad.make
@@ -105,18 +105,18 @@ mad_targetinstall: $(STATEDIR)/mad.targetinstall
 $(STATEDIR)/mad.targetinstall: $(mad_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,mad)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(MAD_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(MAD_DIR)/madplay, /usr/bin/madplay)
-
-	@$(call install_finish)
+	@$(call install_init, mad)
+	@$(call install_fixup, mad,PACKAGE,mad)
+	@$(call install_fixup, mad,PRIORITY,optional)
+	@$(call install_fixup, mad,VERSION,$(MAD_VERSION))
+	@$(call install_fixup, mad,SECTION,base)
+	@$(call install_fixup, mad,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, mad,DEPENDS,)
+	@$(call install_fixup, mad,DESCRIPTION,missing)
+
+	@$(call install_copy, mad, 0, 0, 0755, $(MAD_DIR)/madplay, /usr/bin/madplay)
+
+	@$(call install_finish, mad)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/madwifi.make b/rules/madwifi.make
index 575e3c686..28b877aaf 100644
--- a/rules/madwifi.make
+++ b/rules/madwifi.make
@@ -123,26 +123,26 @@ madwifi_targetinstall: $(STATEDIR)/madwifi.targetinstall
 $(STATEDIR)/madwifi.targetinstall: $(madwifi_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,madwifi)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(MADWIFI_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, madwifi)
+	@$(call install_fixup, madwifi,PACKAGE,madwifi)
+	@$(call install_fixup, madwifi,PRIORITY,optional)
+	@$(call install_fixup, madwifi,VERSION,$(MADWIFI_VERSION))
+	@$(call install_fixup, madwifi,SECTION,base)
+	@$(call install_fixup, madwifi,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, madwifi,DEPENDS,)
+	@$(call install_fixup, madwifi,DESCRIPTION,missing)
 
 	# FIXME: ipkgize
 ifdef PTXCONF_KERNEL_INSTALL
 	cd $(MADWIFI_DIR) && $(MADWIFI_ENV) $(MADWIFI_PATH) $(MAKE) install
 endif
 ifdef PTXCONF_MADWIFI_TOOLS_ATHEROS_STATS
-	@$(call install_copy, 0, 0, 0555, $(MADWIFI_DIR)/tools/athstats, /usr/bin/athstats)
+	@$(call install_copy, madwifi, 0, 0, 0555, $(MADWIFI_DIR)/tools/athstats, /usr/bin/athstats)
 endif
 ifdef PTXCONF_MADWIFI_TOOLS_80211_STATS
-	@$(call install_copy, 0, 0, 0555, $(MADWIFI_DIR)/tools/80211stats, /usr/bin/80211stats)
+	@$(call install_copy, madwifi, 0, 0, 0555, $(MADWIFI_DIR)/tools/80211stats, /usr/bin/80211stats)
 endif
-	@$(call install_finish)
+	@$(call install_finish, madwifi)
 
 	@$(call touch, $@)
 
diff --git a/rules/memedit.make b/rules/memedit.make
index 38c1c3d9c..5cc4d8752 100644
--- a/rules/memedit.make
+++ b/rules/memedit.make
@@ -106,18 +106,18 @@ memedit_targetinstall: $(STATEDIR)/memedit.targetinstall
 $(STATEDIR)/memedit.targetinstall: $(memedit_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,memedit)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(MEMEDIT_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(MEMEDIT_DIR)/memedit, /bin/memedit)
-
-	@$(call install_finish)
+	@$(call install_init, memedit)
+	@$(call install_fixup, memedit,PACKAGE,memedit)
+	@$(call install_fixup, memedit,PRIORITY,optional)
+	@$(call install_fixup, memedit,VERSION,$(MEMEDIT_VERSION))
+	@$(call install_fixup, memedit,SECTION,base)
+	@$(call install_fixup, memedit,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, memedit,DEPENDS,)
+	@$(call install_fixup, memedit,DESCRIPTION,missing)
+
+	@$(call install_copy, memedit, 0, 0, 0755, $(MEMEDIT_DIR)/memedit, /bin/memedit)
+
+	@$(call install_finish, memedit)
 
 	@$(call touch, $@)
 
diff --git a/rules/memstat.make b/rules/memstat.make
index 65e6ae550..2eccbba06 100644
--- a/rules/memstat.make
+++ b/rules/memstat.make
@@ -105,18 +105,18 @@ memstat_targetinstall: $(STATEDIR)/memstat.targetinstall
 $(STATEDIR)/memstat.targetinstall: $(memstat_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,memstat)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(MEMSTAT_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(MEMSTAT_DIR)/memstat, /usr/bin/memstat)
+	@$(call install_init, memstat)
+	@$(call install_fixup, memstat,PACKAGE,memstat)
+	@$(call install_fixup, memstat,PRIORITY,optional)
+	@$(call install_fixup, memstat,VERSION,$(MEMSTAT_VERSION))
+	@$(call install_fixup, memstat,SECTION,base)
+	@$(call install_fixup, memstat,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, memstat,DEPENDS,)
+	@$(call install_fixup, memstat,DESCRIPTION,missing)
+
+	@$(call install_copy, memstat, 0, 0, 0755, $(MEMSTAT_DIR)/memstat, /usr/bin/memstat)
 	
-	@$(call install_finish)
+	@$(call install_finish, memstat)
 
 	@$(call touch, $@)
 
diff --git a/rules/memtest.make b/rules/memtest.make
index 2be3e11c4..66845999c 100644
--- a/rules/memtest.make
+++ b/rules/memtest.make
@@ -102,18 +102,18 @@ memtest_targetinstall: $(STATEDIR)/memtest.targetinstall
 $(STATEDIR)/memtest.targetinstall: $(memtest_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,memtest)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(MEMTEST_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(MEMTEST_DIR)/mtest, /usr/sbin/memtest)
-
-	@$(call install_finish)
+	@$(call install_init, memtest)
+	@$(call install_fixup, memtest,PACKAGE,memtest)
+	@$(call install_fixup, memtest,PRIORITY,optional)
+	@$(call install_fixup, memtest,VERSION,$(MEMTEST_VERSION))
+	@$(call install_fixup, memtest,SECTION,base)
+	@$(call install_fixup, memtest,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, memtest,DEPENDS,)
+	@$(call install_fixup, memtest,DESCRIPTION,missing)
+
+	@$(call install_copy, memtest, 0, 0, 0755, $(MEMTEST_DIR)/mtest, /usr/sbin/memtest)
+
+	@$(call install_finish, memtest)
 
 	@$(call touch, $@)
 
diff --git a/rules/memtester.make b/rules/memtester.make
index 62915c234..033febdaa 100644
--- a/rules/memtester.make
+++ b/rules/memtester.make
@@ -98,18 +98,18 @@ memtester_targetinstall: $(STATEDIR)/memtester.targetinstall
 $(STATEDIR)/memtester.targetinstall: $(memtester_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,memtester)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(MEMTESTER_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(MEMTESTER_DIR)/memtester, /usr/sbin/memtester)
-
-	@$(call install_finish)
+	@$(call install_init, memtester)
+	@$(call install_fixup, memtester,PACKAGE,memtester)
+	@$(call install_fixup, memtester,PRIORITY,optional)
+	@$(call install_fixup, memtester,VERSION,$(MEMTESTER_VERSION))
+	@$(call install_fixup, memtester,SECTION,base)
+	@$(call install_fixup, memtester,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, memtester,DEPENDS,)
+	@$(call install_fixup, memtester,DESCRIPTION,missing)
+
+	@$(call install_copy, memtester, 0, 0, 0755, $(MEMTESTER_DIR)/memtester, /usr/sbin/memtester)
+
+	@$(call install_finish, memtester)
 
 	@$(call touch, $@)
 
diff --git a/rules/mfirebird.make b/rules/mfirebird.make
index bc3dc82b9..20530f843 100644
--- a/rules/mfirebird.make
+++ b/rules/mfirebird.make
@@ -432,30 +432,30 @@ mfirebird_targetinstall: $(STATEDIR)/mfirebird.targetinstall
 $(STATEDIR)/mfirebird.targetinstall: $(mfirebird_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,mfirebird)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(MFIREBIRD_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libgkgfx.so, /usr/lib/libgkgfx.so)
-	@$(call install_copy, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libgtkembedmoz.so, /usr/lib/libgtkembedmoz.so)
-	@$(call install_copy, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libgtkxtbin.so, /usr/lib/libgtkxtbin.so)
-	@$(call install_copy, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libjsj.so, /usr/lib/libjsj.so)
-	@$(call install_copy, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libmozjs.so, /usr/lib/libmozjs.so)
-	@$(call install_copy, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libmozz.so, /usr/lib/libmozz.so)
-	@$(call install_copy, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libnspr4.so, /usr/lib/libnspr4.so)
-	@$(call install_copy, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libnss3.so, /usr/lib/libnss3.so)
-	@$(call install_copy, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libplds4.so, /usr/lib/libplds4.so)
-	@$(call install_copy, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libplc4.so, /usr/lib/libplc4.so)
-	@$(call install_copy, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libsmime3.so, /usr/lib/libsmime3.so)
-	@$(call install_copy, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libsoftokn3.so, /usr/lib/libsoftokn3.so)
-	@$(call install_copy, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libssl3.so, /usr/lib/libssl3.so)
-	@$(call install_copy, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libxpcom.so, /usr/lib/libxpcom.so)
-	@$(call install_copy, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libxpcom_compat.so, /usr/lib/libxpcom_compat.so)
+	@$(call install_init, mfirebird)
+	@$(call install_fixup, mfirebird,PACKAGE,mfirebird)
+	@$(call install_fixup, mfirebird,PRIORITY,optional)
+	@$(call install_fixup, mfirebird,VERSION,$(MFIREBIRD_VERSION))
+	@$(call install_fixup, mfirebird,SECTION,base)
+	@$(call install_fixup, mfirebird,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, mfirebird,DEPENDS,)
+	@$(call install_fixup, mfirebird,DESCRIPTION,missing)
+
+	@$(call install_copy, mfirebird, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libgkgfx.so, /usr/lib/libgkgfx.so)
+	@$(call install_copy, mfirebird, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libgtkembedmoz.so, /usr/lib/libgtkembedmoz.so)
+	@$(call install_copy, mfirebird, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libgtkxtbin.so, /usr/lib/libgtkxtbin.so)
+	@$(call install_copy, mfirebird, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libjsj.so, /usr/lib/libjsj.so)
+	@$(call install_copy, mfirebird, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libmozjs.so, /usr/lib/libmozjs.so)
+	@$(call install_copy, mfirebird, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libmozz.so, /usr/lib/libmozz.so)
+	@$(call install_copy, mfirebird, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libnspr4.so, /usr/lib/libnspr4.so)
+	@$(call install_copy, mfirebird, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libnss3.so, /usr/lib/libnss3.so)
+	@$(call install_copy, mfirebird, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libplds4.so, /usr/lib/libplds4.so)
+	@$(call install_copy, mfirebird, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libplc4.so, /usr/lib/libplc4.so)
+	@$(call install_copy, mfirebird, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libsmime3.so, /usr/lib/libsmime3.so)
+	@$(call install_copy, mfirebird, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libsoftokn3.so, /usr/lib/libsoftokn3.so)
+	@$(call install_copy, mfirebird, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libssl3.so, /usr/lib/libssl3.so)
+	@$(call install_copy, mfirebird, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libxpcom.so, /usr/lib/libxpcom.so)
+	@$(call install_copy, mfirebird, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libxpcom_compat.so, /usr/lib/libxpcom_compat.so)
 
 #	cp -a $(CROSS_LIB_DIR)/lib/mozilla-1.6/components $(ROOTDIR)/usr/lib/mozilla-1.6
 #	cp -a $(CROSS_LIB_DIR)/lib/mozilla-1.6/chrome $(ROOTDIR)/usr/lib/mozilla-1.6
@@ -463,10 +463,10 @@ $(STATEDIR)/mfirebird.targetinstall: $(mfirebird_targetinstall_deps_default)
 
 # BSP: Quick and ... 
 	for file in $(CROSS_LIB_DIR)/lib/mozilla-1.6/*; do 			\
-		$(call install_copy, 0, 0, 0755, $$file, /usr/lib/)		\
+		$(call install_copy, mfirebird, 0, 0, 0755, $$file, /usr/lib/)		\
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, mfirebird)
 
 	@$(call touch, $@)
 
diff --git a/rules/mgetty.make b/rules/mgetty.make
index e0e5a0bdc..e94c61fa5 100644
--- a/rules/mgetty.make
+++ b/rules/mgetty.make
@@ -111,46 +111,46 @@ mgetty_targetinstall: $(STATEDIR)/mgetty.targetinstall
 $(STATEDIR)/mgetty.targetinstall: $(mgetty_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,mgetty)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(MGETTY_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0700, $(MGETTY_DIR)/mgetty, /usr/sbin/mgetty)
+	@$(call install_init, mgetty)
+	@$(call install_fixup, mgetty,PACKAGE,mgetty)
+	@$(call install_fixup, mgetty,PRIORITY,optional)
+	@$(call install_fixup, mgetty,VERSION,$(MGETTY_VERSION))
+	@$(call install_fixup, mgetty,SECTION,base)
+	@$(call install_fixup, mgetty,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, mgetty,DEPENDS,)
+	@$(call install_fixup, mgetty,DESCRIPTION,missing)
+
+	@$(call install_copy, mgetty, 0, 0, 0700, $(MGETTY_DIR)/mgetty, /usr/sbin/mgetty)
 	
 ifdef PTXCONF_MGETTY_INSTALL_CONFIG
-	@$(call install_copy, 0, 0, 0600, $(MGETTY_DIR)/login.config, /etc/mgetty+sendfax/login.config)
-	@$(call install_copy, 0, 0, 0600, $(MGETTY_DIR)/mgetty.config, /etc/mgetty+sendfax/mgetty.config)
-	@$(call install_copy, 0, 0, 0600, $(MGETTY_DIR)/dialin.config, /etc/mgetty+sendfax/dialin.config)
+	@$(call install_copy, mgetty, 0, 0, 0600, $(MGETTY_DIR)/login.config, /etc/mgetty+sendfax/login.config)
+	@$(call install_copy, mgetty, 0, 0, 0600, $(MGETTY_DIR)/mgetty.config, /etc/mgetty+sendfax/mgetty.config)
+	@$(call install_copy, mgetty, 0, 0, 0600, $(MGETTY_DIR)/dialin.config, /etc/mgetty+sendfax/dialin.config)
 endif
 ifdef PTXCONF_MGETTY_CALLBACK
-	@$(call install_copy, 0, 0, 4755, $(MGETTY_DIR)/callback/callback, /usr/sbin/callback)
+	@$(call install_copy, mgetty, 0, 0, 4755, $(MGETTY_DIR)/callback/callback, /usr/sbin/callback)
 endif
 ifdef PTXCONF_SENDFAX
-	@$(call install_copy, 0, 0, 0755, $(MGETTY_DIR)/sendfax, /usr/sbin/sendfax)
-	@$(call install_copy, 0, 0, 0755, $(MGETTY_DIR)/g3/pbm2g3, /usr/bin/pbm2g3)
-	@$(call install_copy, 0, 0, 0755, $(MGETTY_DIR)/g3/g3cat, /usr/bin/g3cat)
-	@$(call install_copy, 0, 0, 0755, $(MGETTY_DIR)/g3/g32pbm, /usr/bin/g32pbm)
+	@$(call install_copy, mgetty, 0, 0, 0755, $(MGETTY_DIR)/sendfax, /usr/sbin/sendfax)
+	@$(call install_copy, mgetty, 0, 0, 0755, $(MGETTY_DIR)/g3/pbm2g3, /usr/bin/pbm2g3)
+	@$(call install_copy, mgetty, 0, 0, 0755, $(MGETTY_DIR)/g3/g3cat, /usr/bin/g3cat)
+	@$(call install_copy, mgetty, 0, 0, 0755, $(MGETTY_DIR)/g3/g32pbm, /usr/bin/g32pbm)
 ifdef PTXCONF_MGETTY_INSTALL_CONFIG
-	@$(call install_copy, 0, 0, 0644, $(MGETTY_DIR)/sendfax.config, /etc/mgetty+sendfax/sendfax.config)
+	@$(call install_copy, mgetty, 0, 0, 0644, $(MGETTY_DIR)/sendfax.config, /etc/mgetty+sendfax/sendfax.config)
 endif	
 ifdef PTXCONF_SENDFAX_SPOOL
-	@$(call install_copy, 0, 0, 0755, $(MGETTY_DIR)/fax/faxspool, /usr/bin/faxspool)
-	@$(call install_copy, 0, 0, 0755, $(MGETTY_DIR)/fax/faxrunq, /usr/bin/faxrunq)
-	@$(call install_copy, 0, 0, 0755, $(MGETTY_DIR)/fax/faxq, /usr/bin/faxq)
-	@$(call install_copy, 0, 0, 0755, $(MGETTY_DIR)/fax/faxrm, /usr/bin/faxrm)
-	@$(call install_copy, 0, 0, 0755, $(MGETTY_DIR)/fax/faxrunqd, /usr/bin/faxrunqd)
-	@$(call install_copy, 0, 0, 0755, $(MGETTY_DIR)/fax/faxq-helper, /usr/lib/mgetty+sendfax/faxq-helper)
+	@$(call install_copy, mgetty, 0, 0, 0755, $(MGETTY_DIR)/fax/faxspool, /usr/bin/faxspool)
+	@$(call install_copy, mgetty, 0, 0, 0755, $(MGETTY_DIR)/fax/faxrunq, /usr/bin/faxrunq)
+	@$(call install_copy, mgetty, 0, 0, 0755, $(MGETTY_DIR)/fax/faxq, /usr/bin/faxq)
+	@$(call install_copy, mgetty, 0, 0, 0755, $(MGETTY_DIR)/fax/faxrm, /usr/bin/faxrm)
+	@$(call install_copy, mgetty, 0, 0, 0755, $(MGETTY_DIR)/fax/faxrunqd, /usr/bin/faxrunqd)
+	@$(call install_copy, mgetty, 0, 0, 0755, $(MGETTY_DIR)/fax/faxq-helper, /usr/lib/mgetty+sendfax/faxq-helper)
 endif
 ifdef PTXCONF_MGETTY_INSTALL_CONFIG
-	@$(call install_copy, 0, 0, 0644, $(MGETTY_DIR)/faxrunq.config, /etc/mgetty+sendfax/faxrunq.config)
+	@$(call install_copy, mgetty, 0, 0, 0644, $(MGETTY_DIR)/faxrunq.config, /etc/mgetty+sendfax/faxrunq.config)
 endif
 endif
-	@$(call install_finish)
+	@$(call install_finish, mgetty)
 	
 	@$(call touch, $@)
 
diff --git a/rules/mico.make b/rules/mico.make
index af0e0e1e7..eb448c84d 100644
--- a/rules/mico.make
+++ b/rules/mico.make
@@ -223,36 +223,36 @@ mico_targetinstall: $(STATEDIR)/mico.targetinstall
 $(STATEDIR)/mico.targetinstall: $(mico_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,mico)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(MICO_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, mico)
+	@$(call install_fixup, mico,PACKAGE,mico)
+	@$(call install_fixup, mico,PRIORITY,optional)
+	@$(call install_fixup, mico,VERSION,$(MICO_VERSION))
+	@$(call install_fixup, mico,SECTION,base)
+	@$(call install_fixup, mico,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, mico,DEPENDS,)
+	@$(call install_fixup, mico,DESCRIPTION,missing)
 
 ifdef PTXCONF_MICO_LIBMICOAUX
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, mico, 0, 0, 0644, \
 		$(MICO_DIR)/libs/libmicoaux$(MICO_VERSION).so, \
 		/usr/lib/libmicoaux$(MICO_VERSION).so)
 endif
 ifdef PTXCONF_MICO_LIBMICOCOSS
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, mico, 0, 0, 0644, \
 		$(MICO_DIR)/libs/libmicocoss$(MICO_VERSION).so, \
 		/usr/lib/libmicocoss$(MICO_VERSION).so)
 endif
 ifdef PTXCONF_MICO_LIBMICOIR
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, mico, 0, 0, 0644, \
 		$(MICO_DIR)/libs/libmicoir$(MICO_VERSION).so, \
 		/usr/lib/libmicoir$(MICO_VERSION).so)
 endif
 ifdef PTXCONF_MICO_LIBMICO
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, mico, 0, 0, 0644, \
 		$(MICO_DIR)/libs/libmico$(MICO_VERSION).so, \
 		/usr/lib/libmico$(MICO_VERSION).so)
 endif
-	@$(call install_finish)
+	@$(call install_finish, mico)
 
 	@$(call touch, $@)
 
diff --git a/rules/mii-diag.make b/rules/mii-diag.make
index 206fc71f3..cc5f5e4e0 100644
--- a/rules/mii-diag.make
+++ b/rules/mii-diag.make
@@ -96,18 +96,18 @@ mii-diag_targetinstall: $(STATEDIR)/mii-diag.targetinstall
 $(STATEDIR)/mii-diag.targetinstall: $(mii-diag_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,mii-diag)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(MII_DIAG_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(MII_DIAG_DIR)/mii-diag, /usr/sbin/mii-diag)
-
-	@$(call install_finish)
+	@$(call install_init, mii-diag)
+	@$(call install_fixup, mii-diag,PACKAGE,mii-diag)
+	@$(call install_fixup, mii-diag,PRIORITY,optional)
+	@$(call install_fixup, mii-diag,VERSION,$(MII_DIAG_VERSION))
+	@$(call install_fixup, mii-diag,SECTION,base)
+	@$(call install_fixup, mii-diag,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, mii-diag,DEPENDS,)
+	@$(call install_fixup, mii-diag,DESCRIPTION,missing)
+
+	@$(call install_copy, mii-diag, 0, 0, 0755, $(MII_DIAG_DIR)/mii-diag, /usr/sbin/mii-diag)
+
+	@$(call install_finish, mii-diag)
 
 	@$(call touch, $@)
 
diff --git a/rules/module-init-tools.make b/rules/module-init-tools.make
index a7b85aead..30d5e3955 100644
--- a/rules/module-init-tools.make
+++ b/rules/module-init-tools.make
@@ -102,35 +102,35 @@ module-init-tools_targetinstall: $(STATEDIR)/module-init-tools.targetinstall
 $(STATEDIR)/module-init-tools.targetinstall: $(module-init-tools_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,module-init-tools)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(MODULE_INIT_TOOLS_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, module-init-tools)
+	@$(call install_fixup, module-init-tools,PACKAGE,module-init-tools)
+	@$(call install_fixup, module-init-tools,PRIORITY,optional)
+	@$(call install_fixup, module-init-tools,VERSION,$(MODULE_INIT_TOOLS_VERSION))
+	@$(call install_fixup, module-init-tools,SECTION,base)
+	@$(call install_fixup, module-init-tools,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, module-init-tools,DEPENDS,)
+	@$(call install_fixup, module-init-tools,DESCRIPTION,missing)
 
 ifdef PTXCONF_MODULE_INIT_TOOLS_INSMOD
-	@$(call install_copy, 0, 0, 0755, $(MODULE_INIT_TOOLS_DIR)/insmod, /sbin/insmod) 
+	@$(call install_copy, module-init-tools, 0, 0, 0755, $(MODULE_INIT_TOOLS_DIR)/insmod, /sbin/insmod) 
 endif
 ifdef PTXCONF_MODULE_INIT_TOOLS_RMMOD
-	@$(call install_copy, 0, 0, 0755, $(MODULE_INIT_TOOLS_DIR)/rmmod, /sbin/rmmod)
+	@$(call install_copy, module-init-tools, 0, 0, 0755, $(MODULE_INIT_TOOLS_DIR)/rmmod, /sbin/rmmod)
 endif
 ifdef PTXCONF_MODULE_INIT_TOOLS_LSMOD
-	@$(call install_copy, 0, 0, 0755, $(MODULE_INIT_TOOLS_DIR)/lsmod, /bin/lsmod)
+	@$(call install_copy, module-init-tools, 0, 0, 0755, $(MODULE_INIT_TOOLS_DIR)/lsmod, /bin/lsmod)
 endif
 ifdef PTXCONF_MODULE_INIT_TOOLS_MODINFO
-	@$(call install_copy, 0, 0, 0755, $(MODULE_INIT_TOOLS_DIR)/modinfo, /sbin/modinfo)
+	@$(call install_copy, module-init-tools, 0, 0, 0755, $(MODULE_INIT_TOOLS_DIR)/modinfo, /sbin/modinfo)
 endif
 ifdef PTXCONF_MODULE_INIT_TOOLS_MODPROBE
-	@$(call install_copy, 0, 0, 0755, $(MODULE_INIT_TOOLS_DIR)/modprobe, /sbin/modprobe)
+	@$(call install_copy, module-init-tools, 0, 0, 0755, $(MODULE_INIT_TOOLS_DIR)/modprobe, /sbin/modprobe)
 endif
 ifdef PTXCONF_MODULE_INIT_TOOLS_DEPMOD
-	@$(call install_copy, 0, 0, 0755, $(MODULE_INIT_TOOLS_DIR)/depmod, /sbin/depmod)
+	@$(call install_copy, module-init-tools, 0, 0, 0755, $(MODULE_INIT_TOOLS_DIR)/depmod, /sbin/depmod)
 endif
 
-	@$(call install_finish)
+	@$(call install_finish, module-init-tools)
 
 	@$(call touch, $@)
 
diff --git a/rules/mplayer.make b/rules/mplayer.make
index 763fdfa8f..aba3ab5da 100644
--- a/rules/mplayer.make
+++ b/rules/mplayer.make
@@ -119,18 +119,18 @@ mplayer_targetinstall: $(STATEDIR)/mplayer.targetinstall
 $(STATEDIR)/mplayer.targetinstall: $(mplayer_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,mplayer)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(MPLAYER_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(MPLAYER_DIR)/mplayer, /usr/bin/mplayer)
-
-	@$(call install_finish)
+	@$(call install_init, mplayer)
+	@$(call install_fixup, mplayer,PACKAGE,mplayer)
+	@$(call install_fixup, mplayer,PRIORITY,optional)
+	@$(call install_fixup, mplayer,VERSION,$(MPLAYER_VERSION))
+	@$(call install_fixup, mplayer,SECTION,base)
+	@$(call install_fixup, mplayer,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, mplayer,DEPENDS,)
+	@$(call install_fixup, mplayer,DESCRIPTION,missing)
+
+	@$(call install_copy, mplayer, 0, 0, 0755, $(MPLAYER_DIR)/mplayer, /usr/bin/mplayer)
+
+	@$(call install_finish, mplayer)
 
 	@$(call touch, $@)
 
diff --git a/rules/mtd.make b/rules/mtd.make
index c22d1c194..a30749857 100644
--- a/rules/mtd.make
+++ b/rules/mtd.make
@@ -151,71 +151,71 @@ mtd_targetinstall: $(STATEDIR)/mtd.targetinstall
 $(STATEDIR)/mtd.targetinstall: $(mtd_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,mtd)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(subst -,,$(MTD_VERSION)))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, mtd)
+	@$(call install_fixup, mtd,PACKAGE,mtd)
+	@$(call install_fixup, mtd,PRIORITY,optional)
+	@$(call install_fixup, mtd,VERSION,$(subst -,,$(MTD_VERSION)))
+	@$(call install_fixup, mtd,SECTION,base)
+	@$(call install_fixup, mtd,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, mtd,DEPENDS,)
+	@$(call install_fixup, mtd,DESCRIPTION,missing)
 
 ifdef PTXCONF_MTD_FLASH_ERASE
-	@$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/flash_erase, /sbin/flash_erase)
+	@$(call install_copy, mtd, 0, 0, 0755, $(MTD_DIR)/util/flash_erase, /sbin/flash_erase)
 endif
 ifdef PTXCONF_MTD_FLASH_ERASEALL
-	@$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/flash_eraseall, /sbin/flash_eraseall)
+	@$(call install_copy, mtd, 0, 0, 0755, $(MTD_DIR)/util/flash_eraseall, /sbin/flash_eraseall)
 endif
 ifdef PTXCONF_MTD_FLASH_INFO
-	@$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/flash_info, /sbin/flash_info)
+	@$(call install_copy, mtd, 0, 0, 0755, $(MTD_DIR)/util/flash_info, /sbin/flash_info)
 endif
 ifdef PTXCONF_MTD_FLASH_LOCK
-	@$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/flash_lock, /sbin/flash_lock)
+	@$(call install_copy, mtd, 0, 0, 0755, $(MTD_DIR)/util/flash_lock, /sbin/flash_lock)
 endif
 ifdef PTXCONF_MTD_FLASH_UNLOCK
-	@$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/flash_unlock, /sbin/flash_unlock)
+	@$(call install_copy, mtd, 0, 0, 0755, $(MTD_DIR)/util/flash_unlock, /sbin/flash_unlock)
 endif
 ifdef PTXCONF_MTD_FLASHCP
-	@$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/flashcp, /sbin/flashcp)
+	@$(call install_copy, mtd, 0, 0, 0755, $(MTD_DIR)/util/flashcp, /sbin/flashcp)
 endif
 ifdef PTXCONF_MTD_FTL_CHECK
-	@$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/ftl_check, /sbin/ftl_check)
+	@$(call install_copy, mtd, 0, 0, 0755, $(MTD_DIR)/util/ftl_check, /sbin/ftl_check)
 endif
 ifdef PTXCONF_MTD_FTL_FORMAT
-	@$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/ftl_format, /sbin/ftl_format)
+	@$(call install_copy, mtd, 0, 0, 0755, $(MTD_DIR)/util/ftl_format, /sbin/ftl_format)
 endif
 ifdef PTXCONF_MTD_JFFS_DUMP
-	@$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/jffs-dump, /sbin/jffs-dump)
+	@$(call install_copy, mtd, 0, 0, 0755, $(MTD_DIR)/util/jffs-dump, /sbin/jffs-dump)
 endif
 ifdef PTXCONF_MTD_JFFS2_DUMP
-	@$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/jffs2dump, /sbin/jffs2dump)
+	@$(call install_copy, mtd, 0, 0, 0755, $(MTD_DIR)/util/jffs2dump, /sbin/jffs2dump)
 endif
 ifdef PTXCONF_MTD_JFFS2READER
-	@$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/jffs2reader, /sbin/jffs2reader)
+	@$(call install_copy, mtd, 0, 0, 0755, $(MTD_DIR)/util/jffs2reader, /sbin/jffs2reader)
 endif
 ifdef PTXCONF_MTD_MTDDEBUG
-	@$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/mtd_debug, /sbin/mtd_debug)
+	@$(call install_copy, mtd, 0, 0, 0755, $(MTD_DIR)/util/mtd_debug, /sbin/mtd_debug)
 endif
 ifdef PTXCONF_MTD_NANDDUMP
-	@$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/nanddump, /sbin/nanddump)
+	@$(call install_copy, mtd, 0, 0, 0755, $(MTD_DIR)/util/nanddump, /sbin/nanddump)
 endif
 ifdef PTXCONF_MTD_NANDWRITE
-	@$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/nandwrite, /sbin/nandwrite)
+	@$(call install_copy, mtd, 0, 0, 0755, $(MTD_DIR)/util/nandwrite, /sbin/nandwrite)
 endif
 ifdef PTXCONF_MTD_NFTL_FORMAT
-	@$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/nftl_format, /sbin/nftl_format)
+	@$(call install_copy, mtd, 0, 0, 0755, $(MTD_DIR)/util/nftl_format, /sbin/nftl_format)
 endif
 ifdef PTXCONF_MTD_NFTLDUMP
-	@$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/nftldump, /sbin/nftldump)
+	@$(call install_copy, mtd, 0, 0, 0755, $(MTD_DIR)/util/nftldump, /sbin/nftldump)
 endif
 ifdef PTXCONF_MTD_MKJFFS
-	@$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/mkfs.jffs, /sbin/mkfs.jffs)
+	@$(call install_copy, mtd, 0, 0, 0755, $(MTD_DIR)/util/mkfs.jffs, /sbin/mkfs.jffs)
 endif
 ifdef PTXCONF_MTD_MKJFFS2
-	@$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/mkfs.jffs2, /sbin/mkfs.jffs2)
+	@$(call install_copy, mtd, 0, 0, 0755, $(MTD_DIR)/util/mkfs.jffs2, /sbin/mkfs.jffs2)
 endif
 
-	@$(call install_finish)
+	@$(call install_finish, mtd)
 
 	@$(call touch, $@)
 
diff --git a/rules/myghty.make b/rules/myghty.make
index f11e8d640..141e3341a 100644
--- a/rules/myghty.make
+++ b/rules/myghty.make
@@ -104,18 +104,18 @@ myghty_targetinstall: $(STATEDIR)/myghty.targetinstall
 $(STATEDIR)/myghty.targetinstall: $(myghty_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,myghty)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(MYGHTY_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	#@$(call install_copy, 0, 0, 0755, $(MYGHTY_DIR)/foobar, /dev/null)
-
-	@$(call install_finish)
+	@$(call install_init, myghty)
+	@$(call install_fixup, myghty,PACKAGE,myghty)
+	@$(call install_fixup, myghty,PRIORITY,optional)
+	@$(call install_fixup, myghty,VERSION,$(MYGHTY_VERSION))
+	@$(call install_fixup, myghty,SECTION,base)
+	@$(call install_fixup, myghty,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, myghty,DEPENDS,)
+	@$(call install_fixup, myghty,DESCRIPTION,missing)
+
+	#@$(call install_copy, myghty, 0, 0, 0755, $(MYGHTY_DIR)/foobar, /dev/null)
+
+	@$(call install_finish, myghty)
 
 	@$(call touch, $@)
 
diff --git a/rules/ncurses.make b/rules/ncurses.make
index aad96c088..c0185b936 100644
--- a/rules/ncurses.make
+++ b/rules/ncurses.make
@@ -108,50 +108,50 @@ ncurses_targetinstall: $(STATEDIR)/ncurses.targetinstall
 $(STATEDIR)/ncurses.targetinstall: $(ncurses_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,ncurses)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(NCURSES_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, $(NCURSES_DIR)/lib/libncurses.so.5.5, /lib/libncurses.so.5.5)
-	@$(call install_link, libncurses.so.5.5, /lib/libncurses.so.5)
-	@$(call install_link, libncurses.so.5.5, /lib/libncurses.so)
+	@$(call install_init, ncurses)
+	@$(call install_fixup, ncurses,PACKAGE,ncurses)
+	@$(call install_fixup, ncurses,PRIORITY,optional)
+	@$(call install_fixup, ncurses,VERSION,$(NCURSES_VERSION))
+	@$(call install_fixup, ncurses,SECTION,base)
+	@$(call install_fixup, ncurses,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, ncurses,DEPENDS,)
+	@$(call install_fixup, ncurses,DESCRIPTION,missing)
+
+	@$(call install_copy, ncurses, 0, 0, 0644, $(NCURSES_DIR)/lib/libncurses.so.5.5, /lib/libncurses.so.5.5)
+	@$(call install_link, ncurses, libncurses.so.5.5, /lib/libncurses.so.5)
+	@$(call install_link, ncurses, libncurses.so.5.5, /lib/libncurses.so)
 
 ifdef PTXCONF_NCURSES_FORM
-	@$(call install_copy, 0, 0, 0644, $(NCURSES_DIR)/lib/libform.so.5.5, /lib/libform.so.5.5)
-	@$(call install_link, libform.so.5.5, /lib/libform.so.5)
-	@$(call install_link, libform.so.5.5, /lib/libform.so)
+	@$(call install_copy, ncurses, 0, 0, 0644, $(NCURSES_DIR)/lib/libform.so.5.5, /lib/libform.so.5.5)
+	@$(call install_link, ncurses, libform.so.5.5, /lib/libform.so.5)
+	@$(call install_link, ncurses, libform.so.5.5, /lib/libform.so)
 endif
 
 ifdef PTXCONF_NCURSES_MENU
-	@$(call install_copy, 0, 0, 0644, $(NCURSES_DIR)/lib/libmenu.so.5.5, /lib/libmenu.so.5.5)
-	@$(call install_link, libmenu.so.5.5, /lib/libmenu.so.5)
-	@$(call install_link, libmenu.so.5.5, /lib/libmenu.so)
+	@$(call install_copy, ncurses, 0, 0, 0644, $(NCURSES_DIR)/lib/libmenu.so.5.5, /lib/libmenu.so.5.5)
+	@$(call install_link, ncurses, libmenu.so.5.5, /lib/libmenu.so.5)
+	@$(call install_link, ncurses, libmenu.so.5.5, /lib/libmenu.so)
 endif
 
 ifdef PTXCONF_NCURSES_PANEL
-	@$(call install_copy, 0, 0, 0644, $(NCURSES_DIR)/lib/libpanel.so.5.5, /lib/libpanel.so.5.5)
-	@$(call install_link, libpanel.so.5.5, /lib/libpanel.so.5)
-	@$(call install_link, libpanel.so.5.5, /lib/libpanel.so)
+	@$(call install_copy, ncurses, 0, 0, 0644, $(NCURSES_DIR)/lib/libpanel.so.5.5, /lib/libpanel.so.5.5)
+	@$(call install_link, ncurses, libpanel.so.5.5, /lib/libpanel.so.5)
+	@$(call install_link, ncurses, libpanel.so.5.5, /lib/libpanel.so)
 endif
 
 ifdef PTXCONF_NCURSES_TERMCAP
 	mkdir -p $(ROOTDIR)/usr/share/terminfo
-	@$(call install_copy, 0, 0, 0644, $(SYSROOT)/usr/share/terminfo/x/xterm, /usr/share/terminfo/x/xterm, n);
-	@$(call install_copy, 0, 0, 0644, $(SYSROOT)/usr/share/terminfo/x/xterm-color, /usr/share/terminfo/x/xterm-color, n);
-	@$(call install_copy, 0, 0, 0644, $(SYSROOT)/usr/share/terminfo/x/xterm-xfree86, /usr/share/terminfo/x/xterm-xfree86, n);
-	@$(call install_copy, 0, 0, 0644, $(SYSROOT)/usr/share/terminfo/v/vt100, /usr/share/terminfo/v/vt100, n);
-	@$(call install_copy, 0, 0, 0644, $(SYSROOT)/usr/share/terminfo/v/vt102, /usr/share/terminfo/v/vt102, n);
-	@$(call install_copy, 0, 0, 0644, $(SYSROOT)/usr/share/terminfo/v/vt200, /usr/share/terminfo/v/vt200, n);
-	@$(call install_copy, 0, 0, 0644, $(SYSROOT)/usr/share/terminfo/a/ansi, /usr/share/terminfo/a/ansi, n);
-	@$(call install_copy, 0, 0, 0644, $(SYSROOT)/usr/share/terminfo/l/linux, /usr/share/terminfo/l/linux, n);
+	@$(call install_copy, ncurses, 0, 0, 0644, $(SYSROOT)/usr/share/terminfo/x/xterm, /usr/share/terminfo/x/xterm, n);
+	@$(call install_copy, ncurses, 0, 0, 0644, $(SYSROOT)/usr/share/terminfo/x/xterm-color, /usr/share/terminfo/x/xterm-color, n);
+	@$(call install_copy, ncurses, 0, 0, 0644, $(SYSROOT)/usr/share/terminfo/x/xterm-xfree86, /usr/share/terminfo/x/xterm-xfree86, n);
+	@$(call install_copy, ncurses, 0, 0, 0644, $(SYSROOT)/usr/share/terminfo/v/vt100, /usr/share/terminfo/v/vt100, n);
+	@$(call install_copy, ncurses, 0, 0, 0644, $(SYSROOT)/usr/share/terminfo/v/vt102, /usr/share/terminfo/v/vt102, n);
+	@$(call install_copy, ncurses, 0, 0, 0644, $(SYSROOT)/usr/share/terminfo/v/vt200, /usr/share/terminfo/v/vt200, n);
+	@$(call install_copy, ncurses, 0, 0, 0644, $(SYSROOT)/usr/share/terminfo/a/ansi, /usr/share/terminfo/a/ansi, n);
+	@$(call install_copy, ncurses, 0, 0, 0644, $(SYSROOT)/usr/share/terminfo/l/linux, /usr/share/terminfo/l/linux, n);
 endif
 
-	@$(call install_finish)
+	@$(call install_finish, ncurses)
 
 	@$(call touch, $@)
 
diff --git a/rules/netcat.make b/rules/netcat.make
index d494c93f7..4308c4392 100644
--- a/rules/netcat.make
+++ b/rules/netcat.make
@@ -119,19 +119,19 @@ netcat_targetinstall: $(STATEDIR)/netcat.targetinstall
 $(STATEDIR)/netcat.targetinstall: $(netcat_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,netcat)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(NETCAT_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Bjoern Buerger <b.buerger\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,libc)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(NETCAT_DIR)/src/netcat, /bin/netcat)
-	@$(call install_link, netcat, /bin/nc)
-
-	@$(call install_finish)
+	@$(call install_init, netcat)
+	@$(call install_fixup, netcat,PACKAGE,netcat)
+	@$(call install_fixup, netcat,PRIORITY,optional)
+	@$(call install_fixup, netcat,VERSION,$(NETCAT_VERSION))
+	@$(call install_fixup, netcat,SECTION,base)
+	@$(call install_fixup, netcat,AUTHOR,"Bjoern Buerger <b.buerger\@pengutronix.de>")
+	@$(call install_fixup, netcat,DEPENDS,libc)
+	@$(call install_fixup, netcat,DESCRIPTION,missing)
+
+	@$(call install_copy, netcat, 0, 0, 0755, $(NETCAT_DIR)/src/netcat, /bin/netcat)
+	@$(call install_link, netcat, netcat, /bin/nc)
+
+	@$(call install_finish, netcat)
 
 	@$(call touch, $@)
 
diff --git a/rules/netkit-ftp.make b/rules/netkit-ftp.make
index 3d9e1422e..5d4e02a95 100644
--- a/rules/netkit-ftp.make
+++ b/rules/netkit-ftp.make
@@ -119,18 +119,18 @@ netkit-ftp_targetinstall: $(STATEDIR)/netkit-ftp.targetinstall
 $(STATEDIR)/netkit-ftp.targetinstall: $(netkit-ftp_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,netkit-ftp)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(NETKIT-FTP_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,libc)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(NETKIT-FTP_DIR)/ftp/ftp, /bin/ftp)
-
-	@$(call install_finish)
+	@$(call install_init, netkit-ftp)
+	@$(call install_fixup, netkit-ftp,PACKAGE,netkit-ftp)
+	@$(call install_fixup, netkit-ftp,PRIORITY,optional)
+	@$(call install_fixup, netkit-ftp,VERSION,$(NETKIT-FTP_VERSION))
+	@$(call install_fixup, netkit-ftp,SECTION,base)
+	@$(call install_fixup, netkit-ftp,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, netkit-ftp,DEPENDS,libc)
+	@$(call install_fixup, netkit-ftp,DESCRIPTION,missing)
+
+	@$(call install_copy, netkit-ftp, 0, 0, 0755, $(NETKIT-FTP_DIR)/ftp/ftp, /bin/ftp)
+
+	@$(call install_finish, netkit-ftp)
 
 	@$(call touch, $@)
 
diff --git a/rules/nfsutils.make b/rules/nfsutils.make
index dc41f18b0..dd08f0ae8 100644
--- a/rules/nfsutils.make
+++ b/rules/nfsutils.make
@@ -134,97 +134,97 @@ nfsutils_targetinstall: $(STATEDIR)/nfsutils.targetinstall
 $(STATEDIR)/nfsutils.targetinstall: $(STATEDIR)/nfsutils.install
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,nfsutils)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(NFSUTILS_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, nfsutils)
+	@$(call install_fixup, nfsutils,PACKAGE,nfsutils)
+	@$(call install_fixup, nfsutils,PRIORITY,optional)
+	@$(call install_fixup, nfsutils,VERSION,$(NFSUTILS_VERSION))
+	@$(call install_fixup, nfsutils,SECTION,base)
+	@$(call install_fixup, nfsutils,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, nfsutils,DEPENDS,)
+	@$(call install_fixup, nfsutils,DESCRIPTION,missing)
 
         ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_CLIENTSCRIPT))
-	@$(call install_copy, 0, 0, 0755, $(NFSUTILS_DIR)/etc/nodist/nfs-client, /etc/init.d/nfs-client, n)
+	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/etc/nodist/nfs-client, /etc/init.d/nfs-client, n)
         endif
         ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_FUNCTIONSSCRIPT))
-	@$(call install_copy, 0, 0, 0644, $(NFSUTILS_DIR)/etc/nodist/nfs-functions, /etc/init.d/nfs-functions, n)
+	@$(call install_copy, nfsutils, 0, 0, 0644, $(NFSUTILS_DIR)/etc/nodist/nfs-functions, /etc/init.d/nfs-functions, n)
         endif
         ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_SERVERSCRIPT))
-	@$(call install_copy, 0, 0, 0755, $(NFSUTILS_DIR)/etc/nodist/nfs-server, /etc/init.d/nfs-server, n)
+	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/etc/nodist/nfs-server, /etc/init.d/nfs-server, n)
         endif
 
         ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_EXPORTFS))
-	@$(call install_copy, 0, 0, 0755, $(NFSUTILS_DIR)/utils/exportfs/.libs/exportfs, /sbin/exportfs)
+	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/utils/exportfs/.libs/exportfs, /sbin/exportfs)
         endif
         ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_LOCKD))
-	@$(call install_copy, 0, 0, 0755, $(NFSUTILS_DIR)/utils/lockd/.libs/lockd, /sbin/lockd)
+	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/utils/lockd/.libs/lockd, /sbin/lockd)
         endif
         ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_MOUNTD))
-	@$(call install_copy, 0, 0, 0755, $(NFSUTILS_DIR)/utils/mountd/.libs/mountd, /sbin/mountd)
+	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/utils/mountd/.libs/mountd, /sbin/mountd)
         endif
         ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_NFSD))
-	@$(call install_copy, 0, 0, 0755, $(NFSUTILS_DIR)/utils/nfsd/.libs/nfsd, /sbin/nfsd)
+	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/utils/nfsd/.libs/nfsd, /sbin/nfsd)
         endif
         ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_NFSSTAT))
-	@$(call install_copy, 0, 0, 0755, $(NFSUTILS_DIR)/utils/nfsstat/.libs/nfsstat, /sbin/nfsstat)
+	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/utils/nfsstat/.libs/nfsstat, /sbin/nfsstat)
         endif
         ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_NHFSGRAPH))
 # don't strip, this is a shell script
-	@$(call install_copy, 0, 0, 0755, $(NFSUTILS_DIR)/utils/nhfsstone/nhfsgraph, /sbin/nhfsgraph, n)
+	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/utils/nhfsstone/nhfsgraph, /sbin/nhfsgraph, n)
         endif
         ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_NHFSNUMS))
 # don't strip, this is a shell script
-	@$(call install_copy, 0, 0, 0755, $(NFSUTILS_DIR)/utils/nhfsstone/nhfsnums, /sbin/nhfsnums, n)
+	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/utils/nhfsstone/nhfsnums, /sbin/nhfsnums, n)
         endif
         ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_NHFSRUN))
 # don't strip, this is a shell script
-	@$(call install_copy, 0, 0, 0755, $(NFSUTILS_DIR)/utils/nhfsstone/nhfsrun, /sbin/nhfsrun, n)
+	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/utils/nhfsstone/nhfsrun, /sbin/nhfsrun, n)
         endif
         ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_NHFSSTONE))
-	@$(call install_copy, 0, 0, 0755, $(NFSUTILS_DIR)/utils/nhfsstone/.libs/nhfsstone, /sbin/nhfsstone)
+	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/utils/nhfsstone/.libs/nhfsstone, /sbin/nhfsstone)
         endif
         ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_SHOWMOUNT))
-	@$(call install_copy, 0, 0, 0755, $(NFSUTILS_DIR)/utils/showmount/.libs/showmount, /sbin/showmount)
+	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/utils/showmount/.libs/showmount, /sbin/showmount)
         endif
         ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_STATD))
-	@$(call install_copy, 0, 0, 0755, $(NFSUTILS_DIR)/utils/statd/.libs/statd, /sbin/statd)
+	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/utils/statd/.libs/statd, /sbin/statd)
         endif
 # copy necessary libs
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, nfsutils, 0, 0, 0644, \
 		$(NFSUTILS_DIR)/support/export/.libs/libexport.so.0.0.0, \
 		/usr/lib/libexport.so.0.0.0)
-	@$(call install_link, libexport.so.0.0.0, /usr/lib/libexport.so.0.0)
-	@$(call install_link, libexport.so.0.0.0, /usr/lib/libexport.so.0)
+	@$(call install_link, nfsutils, libexport.so.0.0.0, /usr/lib/libexport.so.0.0)
+	@$(call install_link, nfsutils, libexport.so.0.0.0, /usr/lib/libexport.so.0)
 
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, nfsutils, 0, 0, 0644, \
 		$(NFSUTILS_DIR)/support/nfs/.libs/libnfs.so.0.0.0, \
 		/usr/lib/libnfs.so.0.0.0)
-	@$(call install_link, libnfs.so.0.0.0, /usr/lib/libnfs.so.0.0)
-	@$(call install_link, libnfs.so.0.0.0, /usr/lib/libnfs.so.0)
+	@$(call install_link, nfsutils, libnfs.so.0.0.0, /usr/lib/libnfs.so.0.0)
+	@$(call install_link, nfsutils, libnfs.so.0.0.0, /usr/lib/libnfs.so.0)
 
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, nfsutils, 0, 0, 0644, \
 		$(NFSUTILS_DIR)/support/misc/.libs/libmisc.so.0.0.0, \
 		/usr/lib/libmisc.so.0.0.0)
-	@$(call install_link, libmisc.so.0.0.0, /usr/lib/libmisc.so.0.0)
-	@$(call install_link, libmisc.so.0.0.0, /usr/lib/libmisc.so.0)
+	@$(call install_link, nfsutils, libmisc.so.0.0.0, /usr/lib/libmisc.so.0.0)
+	@$(call install_link, nfsutils, libmisc.so.0.0.0, /usr/lib/libmisc.so.0)
 
 	mkdir -p $(NFSUTILS_DIR)/ptxdist_install_tmp
 	touch $(NFSUTILS_DIR)/ptxdist_install_tmp/etab
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, nfsutils, 0, 0, 0755, \
 		$(NFSUTILS_DIR)/ptxdist_install_tmp/etab, \
 		/var/lib/nfs/etab, n)
 
 	touch $(NFSUTILS_DIR)/ptxdist_install_tmp/rmtab
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, nfsutils, 0, 0, 0755, \
 		$(NFSUTILS_DIR)/ptxdist_install_tmp/rmtab, \
 		/var/lib/nfs/rmtab, n)
 
 	touch $(NFSUTILS_DIR)/ptxdist_install_tmp/xtab
-	@$(call install_copy, 0, 0, 0755, \
+	@$(call install_copy, nfsutils, 0, 0, 0755, \
 		$(NFSUTILS_DIR)/ptxdist_install_tmp/xtab, \
 		/var/lib/nfs/xtab, n)
 
-	@$(call install_finish)
+	@$(call install_finish, nfsutils)
 
 	@$(call touch, $@)
 
diff --git a/rules/nmap.make b/rules/nmap.make
index 8269f0eb4..dc3365f06 100644
--- a/rules/nmap.make
+++ b/rules/nmap.make
@@ -128,25 +128,25 @@ nmap_targetinstall: $(STATEDIR)/nmap.targetinstall
 $(STATEDIR)/nmap.targetinstall: $(nmap_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,nmap)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(NMAP_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, nmap)
+	@$(call install_fixup, nmap,PACKAGE,nmap)
+	@$(call install_fixup, nmap,PRIORITY,optional)
+	@$(call install_fixup, nmap,VERSION,$(NMAP_VERSION))
+	@$(call install_fixup, nmap,SECTION,base)
+	@$(call install_fixup, nmap,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, nmap,DEPENDS,)
+	@$(call install_fixup, nmap,DESCRIPTION,missing)
 
-	@$(call install_copy, 0, 0, 0755, $(NMAP_DIR)/nmap, /usr/bin/nmap)
+	@$(call install_copy, nmap, 0, 0, 0755, $(NMAP_DIR)/nmap, /usr/bin/nmap)
 
 ifdef PTXCONF_NMAP_SERVICES
-	@$(call install_copy, 0, 0, 0644, $(NMAP_DIR)/nmap-os-fingerprints, /usr/share/nmap/nmap-os-fingerprints, n)
-	@$(call install_copy, 0, 0, 0644, $(NMAP_DIR)/nmap-service-probes, /usr/share/nmap/nmap-service-probes, n)
-	@$(call install_copy, 0, 0, 0644, $(NMAP_DIR)/nmap-services, /usr/share/nmap/nmap-services, n)
-	@$(call install_copy, 0, 0, 0644, $(NMAP_DIR)/nmap-protocols, /usr/share/nmap/nmap-protocols, n)
-	@$(call install_copy, 0, 0, 0644, $(NMAP_DIR)/nmap-rpc, /usr/share/nmap/nmap-rpc, n)
+	@$(call install_copy, nmap, 0, 0, 0644, $(NMAP_DIR)/nmap-os-fingerprints, /usr/share/nmap/nmap-os-fingerprints, n)
+	@$(call install_copy, nmap, 0, 0, 0644, $(NMAP_DIR)/nmap-service-probes, /usr/share/nmap/nmap-service-probes, n)
+	@$(call install_copy, nmap, 0, 0, 0644, $(NMAP_DIR)/nmap-services, /usr/share/nmap/nmap-services, n)
+	@$(call install_copy, nmap, 0, 0, 0644, $(NMAP_DIR)/nmap-protocols, /usr/share/nmap/nmap-protocols, n)
+	@$(call install_copy, nmap, 0, 0, 0644, $(NMAP_DIR)/nmap-rpc, /usr/share/nmap/nmap-rpc, n)
 endif
-	@$(call install_finish)
+	@$(call install_finish, nmap)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/ntp.make b/rules/ntp.make
index 878dd0eb0..9442754d8 100644
--- a/rules/ntp.make
+++ b/rules/ntp.make
@@ -347,31 +347,31 @@ ntp_targetinstall: $(STATEDIR)/ntp.targetinstall
 $(STATEDIR)/ntp.targetinstall: $(ntp_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,ntp)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(NTP_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, ntp)
+	@$(call install_fixup, ntp,PACKAGE,ntp)
+	@$(call install_fixup, ntp,PRIORITY,optional)
+	@$(call install_fixup, ntp,VERSION,$(NTP_VERSION))
+	@$(call install_fixup, ntp,SECTION,base)
+	@$(call install_fixup, ntp,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, ntp,DEPENDS,)
+	@$(call install_fixup, ntp,DESCRIPTION,missing)
 
 ifdef PTXCONF_NTP_NTPDATE
-	@$(call install_copy, 0, 0, 0755, $(NTP_DIR)/ntpdate/ntpdate, /usr/sbin/ntpdate)
+	@$(call install_copy, ntp, 0, 0, 0755, $(NTP_DIR)/ntpdate/ntpdate, /usr/sbin/ntpdate)
 endif
 ifdef PTXCONF_NTP_NTPD
-	@$(call install_copy, 0, 0, 0755, $(NTP_DIR)/ntpd/ntpd, /usr/sbin/ntpd)
-	@$(call install_copy, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/ntp, /etc/init.d/ntp-server, n)
+	@$(call install_copy, ntp, 0, 0, 0755, $(NTP_DIR)/ntpd/ntpd, /usr/sbin/ntpd)
+	@$(call install_copy, ntp, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/ntp, /etc/init.d/ntp-server, n)
 endif
 ifdef PTXCONF_NTP_NTPDC
-	@$(call install_copy, 0, 0, 0755, $(NTP_DIR)/ntpdc/ntpdc, /usr/sbin/ntpdc)
-	@$(call install_link, /etc/init.d/ntp-server, /etc/init.d/ntp-client, n)
+	@$(call install_copy, ntp, 0, 0, 0755, $(NTP_DIR)/ntpdc/ntpdc, /usr/sbin/ntpdc)
+	@$(call install_link, ntp, /etc/init.d/ntp-server, /etc/init.d/ntp-client, n)
 endif
 ifdef PTXCONF_NTP_NTPQ
-	@$(call install_copy, 0, 0, 0755, $(NTP_DIR)/ntpq/ntpq, /usr/sbin/ntpq)
+	@$(call install_copy, ntp, 0, 0, 0755, $(NTP_DIR)/ntpq/ntpq, /usr/sbin/ntpq)
 endif
 
-	@$(call install_finish)
+	@$(call install_finish, ntp)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/ntpclient.make b/rules/ntpclient.make
index 236229794..1255bb41f 100644
--- a/rules/ntpclient.make
+++ b/rules/ntpclient.make
@@ -87,16 +87,16 @@ ntpclient_targetinstall: $(STATEDIR)/ntpclient.targetinstall
 
 $(STATEDIR)/ntpclient.targetinstall: $(ntpclient_targetinstall_deps_default)
 	@$(call targetinfo, $@)
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,ntpclient)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(NTPCLIENT_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-	@$(call install_copy, 0, 0, 0755, $(NTPCLIENT_DIR)/ntpclient, /usr/sbin/ntpclient)
-	@$(call install_finish)
+	@$(call install_init, ntpclient)
+	@$(call install_fixup, ntpclient,PACKAGE,ntpclient)
+	@$(call install_fixup, ntpclient,PRIORITY,optional)
+	@$(call install_fixup, ntpclient,VERSION,$(NTPCLIENT_VERSION))
+	@$(call install_fixup, ntpclient,SECTION,base)
+	@$(call install_fixup, ntpclient,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, ntpclient,DEPENDS,)
+	@$(call install_fixup, ntpclient,DESCRIPTION,missing)
+	@$(call install_copy, ntpclient, 0, 0, 0755, $(NTPCLIENT_DIR)/ntpclient, /usr/sbin/ntpclient)
+	@$(call install_finish, ntpclient)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/openafs.make b/rules/openafs.make
index 300ded885..ec080e1ca 100644
--- a/rules/openafs.make
+++ b/rules/openafs.make
@@ -111,18 +111,18 @@ openafs_targetinstall: $(STATEDIR)/openafs.targetinstall
 $(STATEDIR)/openafs.targetinstall: $(openafs_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,openafs)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(OPENAFS_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, openafs)
+	@$(call install_fixup, openafs,PACKAGE,openafs)
+	@$(call install_fixup, openafs,PRIORITY,optional)
+	@$(call install_fixup, openafs,VERSION,$(OPENAFS_VERSION))
+	@$(call install_fixup, openafs,SECTION,base)
+	@$(call install_fixup, openafs,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, openafs,DEPENDS,)
+	@$(call install_fixup, openafs,DESCRIPTION,missing)
 	
-	@$(call install_copy, 0, 0, 0744, $(OPENAFS_DIR)/$(OPENAFS_SYS)/dest/root.client/usr/vice, /usr/bin/vice)
+	@$(call install_copy, openafs, 0, 0, 0744, $(OPENAFS_DIR)/$(OPENAFS_SYS)/dest/root.client/usr/vice, /usr/bin/vice)
 
-	@$(call install_finish)
+	@$(call install_finish, openafs)
 
 	@$(call touch, $@)
 
diff --git a/rules/openntpd.make b/rules/openntpd.make
index 9f46faa64..697ea0b0a 100644
--- a/rules/openntpd.make
+++ b/rules/openntpd.make
@@ -115,18 +115,18 @@ openntpd_targetinstall: $(STATEDIR)/openntpd.targetinstall
 $(STATEDIR)/openntpd.targetinstall: $(openntpd_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,openntpd)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(OPENNTPD_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Bjoern Buerger <b.buerger\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(OPENNTPD_DIR)/ntpd, /usr/sbin/ntpd)
-
-	@$(call install_finish)
+	@$(call install_init, openntpd)
+	@$(call install_fixup, openntpd,PACKAGE,openntpd)
+	@$(call install_fixup, openntpd,PRIORITY,optional)
+	@$(call install_fixup, openntpd,VERSION,$(OPENNTPD_VERSION))
+	@$(call install_fixup, openntpd,SECTION,base)
+	@$(call install_fixup, openntpd,AUTHOR,"Bjoern Buerger <b.buerger\@pengutronix.de>")
+	@$(call install_fixup, openntpd,DEPENDS,)
+	@$(call install_fixup, openntpd,DESCRIPTION,missing)
+
+	@$(call install_copy, openntpd, 0, 0, 0755, $(OPENNTPD_DIR)/ntpd, /usr/sbin/ntpd)
+
+	@$(call install_finish, openntpd)
 
 	@$(call touch, $@)
 
diff --git a/rules/openssh.make b/rules/openssh.make
index 16639e18e..329fff04e 100644
--- a/rules/openssh.make
+++ b/rules/openssh.make
@@ -158,45 +158,45 @@ openssh_targetinstall: $(STATEDIR)/openssh.targetinstall
 $(STATEDIR)/openssh.targetinstall: $(openssh_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,openssh)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(OPENSSH_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, openssh)
+	@$(call install_fixup, openssh,PACKAGE,openssh)
+	@$(call install_fixup, openssh,PRIORITY,optional)
+	@$(call install_fixup, openssh,VERSION,$(OPENSSH_VERSION))
+	@$(call install_fixup, openssh,SECTION,base)
+	@$(call install_fixup, openssh,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, openssh,DEPENDS,)
+	@$(call install_fixup, openssh,DESCRIPTION,missing)
 	
 ifdef PTXCONF_OPENSSH_SSH
-	@$(call install_copy, 0, 0, 0644, $(OPENSSH_DIR)/ssh_config.out, /etc/ssh/ssh_config, n)
-	@$(call install_copy, 0, 0, 0755, $(OPENSSH_DIR)/ssh, /usr/bin/ssh)
+	@$(call install_copy, openssh, 0, 0, 0644, $(OPENSSH_DIR)/ssh_config.out, /etc/ssh/ssh_config, n)
+	@$(call install_copy, openssh, 0, 0, 0755, $(OPENSSH_DIR)/ssh, /usr/bin/ssh)
 endif
 
 ifdef PTXCONF_OPENSSH_SSHD
-	@$(call install_copy, 0, 0, 0644, $(OPENSSH_DIR)/moduli.out, /etc/ssh/moduli, n)
-	@$(call install_copy, 0, 0, 0644, $(OPENSSH_DIR)/sshd_config.out, /etc/ssh/sshd_config, n)
+	@$(call install_copy, openssh, 0, 0, 0644, $(OPENSSH_DIR)/moduli.out, /etc/ssh/moduli, n)
+	@$(call install_copy, openssh, 0, 0, 0644, $(OPENSSH_DIR)/sshd_config.out, /etc/ssh/sshd_config, n)
 	perl -p -i -e "s/#PermitRootLogin yes/PermitRootLogin yes/" \
 		$(ROOTDIR)/etc/ssh/sshd_config
 	perl -p -i -e "s/#PermitRootLogin yes/PermitRootLogin yes/" \
 		$(IMAGEDIR)/ipkg/etc/ssh/sshd_config
-	@$(call install_copy, 0, 0, 0755, $(OPENSSH_DIR)/sshd, /usr/sbin/sshd)
+	@$(call install_copy, openssh, 0, 0, 0755, $(OPENSSH_DIR)/sshd, /usr/sbin/sshd)
 endif
 
 ifdef PTXCONF_OPENSSH_SCP
-	@$(call install_copy, 0, 0, 0755, $(OPENSSH_DIR)/scp, /usr/bin/scp)
+	@$(call install_copy, openssh, 0, 0, 0755, $(OPENSSH_DIR)/scp, /usr/bin/scp)
 endif
 
 ifdef PTXCONF_OPENSSH_SFTP_SERVER
-	@$(call install_copy, 0, 0, 0755, $(OPENSSH_DIR)/sftp-server, /usr/sbin/sftp-server)
+	@$(call install_copy, openssh, 0, 0, 0755, $(OPENSSH_DIR)/sftp-server, /usr/sbin/sftp-server)
 endif
 
 ifdef PTXCONF_OPENSSH_KEYGEN
 	# FIXME: if this is the only file in this directory move it
 	# to somewhere else (patch, echo << EOF?) [RSC]
-	@$(call install_copy, 0, 0, 0755, $(PTXDIST_TOPDIR)/scripts/openssh-host-keygen.sh, /sbin/openssh-host-keygen.sh, n)
-	@$(call install_copy, 0, 0, 0755, $(OPENSSH_DIR)/ssh-keygen, /usr/bin/ssh-keygen)
+	@$(call install_copy, openssh, 0, 0, 0755, $(PTXDIST_TOPDIR)/scripts/openssh-host-keygen.sh, /sbin/openssh-host-keygen.sh, n)
+	@$(call install_copy, openssh, 0, 0, 0755, $(OPENSSH_DIR)/ssh-keygen, /usr/bin/ssh-keygen)
 endif
-	@$(call install_finish)
+	@$(call install_finish, openssh)
 
 	@$(call touch, $@)
 
diff --git a/rules/openssl.make b/rules/openssl.make
index 686723f91..1ca7044b7 100644
--- a/rules/openssl.make
+++ b/rules/openssl.make
@@ -157,25 +157,25 @@ openssl_targetinstall: $(STATEDIR)/openssl.targetinstall
 $(STATEDIR)/openssl.targetinstall: $(openssl_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,openssl)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(OPENSSL_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, openssl)
+	@$(call install_fixup, openssl,PACKAGE,openssl)
+	@$(call install_fixup, openssl,PRIORITY,optional)
+	@$(call install_fixup, openssl,VERSION,$(OPENSSL_VERSION))
+	@$(call install_fixup, openssl,SECTION,base)
+	@$(call install_fixup, openssl,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, openssl,DEPENDS,)
+	@$(call install_fixup, openssl,DESCRIPTION,missing)
 	
 ifdef PTXCONF_OPENSSL_SHARED
-	@$(call install_copy, 0, 0, 0644, $(OPENSSL_DIR)/libssl.so.0.9.7, /usr/lib/libssl.so.0.9.7)
-	@$(call install_link, libssl.so.0.9.7, /usr/lib/libssl.so.0)
-	@$(call install_link, libssl.so.0.9.7, /usr/lib/libssl.so)
+	@$(call install_copy, openssl, 0, 0, 0644, $(OPENSSL_DIR)/libssl.so.0.9.7, /usr/lib/libssl.so.0.9.7)
+	@$(call install_link, openssl, libssl.so.0.9.7, /usr/lib/libssl.so.0)
+	@$(call install_link, openssl, libssl.so.0.9.7, /usr/lib/libssl.so)
 
-	@$(call install_copy, 0, 0, 0644, $(OPENSSL_DIR)/libcrypto.so.0.9.7, /usr/lib/libcrypto.so.0.9.7)
-	@$(call install_link, libcrypto.so.0.9.7, /usr/lib/libcrypto.so.0)
-	@$(call install_link, libcrypto.so.0.9.7, /usr/lib/libcrypto.so)
+	@$(call install_copy, openssl, 0, 0, 0644, $(OPENSSL_DIR)/libcrypto.so.0.9.7, /usr/lib/libcrypto.so.0.9.7)
+	@$(call install_link, openssl, libcrypto.so.0.9.7, /usr/lib/libcrypto.so.0)
+	@$(call install_link, openssl, libcrypto.so.0.9.7, /usr/lib/libcrypto.so)
 endif
-	@$(call install_finish)
+	@$(call install_finish, openssl)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/pango12.make b/rules/pango12.make
index 21ad22a61..2d736345f 100644
--- a/rules/pango12.make
+++ b/rules/pango12.make
@@ -111,42 +111,42 @@ pango12_targetinstall: $(STATEDIR)/pango12.targetinstall
 $(STATEDIR)/pango12.targetinstall: $(pango12_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,pango12)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(PANGO12_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, pango)
+	@$(call install_fixup, pango,PACKAGE,pango12)
+	@$(call install_fixup, pango,PRIORITY,optional)
+	@$(call install_fixup, pango,VERSION,$(PANGO12_VERSION))
+	@$(call install_fixup, pango,SECTION,base)
+	@$(call install_fixup, pango,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, pango,DEPENDS,)
+	@$(call install_fixup, pango,DESCRIPTION,missing)
 
 	rm -f $(ROOTDIR)/lib/libpango-1.0.so*
 
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, pango, 0, 0, 0644, \
 		$(PANGO12_DIR)/pango/.libs/libpango-1.0.so.0.300.2, \
 		/usr/lib/libpango-1.0.so.0.300.2)
-	@$(call install_link, libpango-1.0.so.0.300.2, /usr/lib/libpango-1.0.so.0)
-	@$(call install_link, libpango-1.0.so.0.300.2, /usr/lib/libpango-1.0.so)
+	@$(call install_link, pango, libpango-1.0.so.0.300.2, /usr/lib/libpango-1.0.so.0)
+	@$(call install_link, pango, libpango-1.0.so.0.300.2, /usr/lib/libpango-1.0.so)
 
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, pango, 0, 0, 0644, \
 		$(PANGO12_DIR)/pango/.libs/libpangox-1.0.so.0.300.2, \
 		/usr/lib/libpangox-1.0.so.0.300.2)
-	@$(call install_link, libpangox-1.0.so.0.300.2, /lib/libpangox-1.0.so.0)
-	@$(call install_link, libpangox-1.0.so.0.300.2, /lib/libpangox-1.0.so)
+	@$(call install_link, pango, libpangox-1.0.so.0.300.2, /lib/libpangox-1.0.so.0)
+	@$(call install_link, pango, libpangox-1.0.so.0.300.2, /lib/libpangox-1.0.so)
 
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, pango, 0, 0, 0644, \
 		$(PANGO12_DIR)/pango/.libs/libpangoxft-1.0.so.0.300.2, \
 		/usr/lib/libpangoxft-1.0.so.0.300.2)
-	@$(call install_link, libpangoxft-1.0.so.0.300.2, /usr/lib/libpangoxft-1.0.so.0)
-	@$(call install_link, libpangoxft-1.0.so.0.300.2, /usr/lib/libpangoxft-1.0.so)
+	@$(call install_link, pango, libpangoxft-1.0.so.0.300.2, /usr/lib/libpangoxft-1.0.so.0)
+	@$(call install_link, pango, libpangoxft-1.0.so.0.300.2, /usr/lib/libpangoxft-1.0.so)
 
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, pango, 0, 0, 0644, \
 		$(PANGO12_DIR)/pango/.libs/libpangoft2-1.0.so.0.300.2, \
 		/usr/lib/libpangoft2-1.0.so.0.300.2)
-	@$(call install_link, libpangoft2-1.0.so.0.300.2, /lib/libpangoft2-1.0.so.0)
-	@$(call install_link, libpangoft2-1.0.so.0.300.2, /lib/libpangoft2-1.0.so)
+	@$(call install_link, pango, libpangoft2-1.0.so.0.300.2, /lib/libpangoft2-1.0.so.0)
+	@$(call install_link, pango, libpangoft2-1.0.so.0.300.2, /lib/libpangoft2-1.0.so)
 
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, pango, 0, 0, 0644, \
 		$(PANGO12_DIR)/pango/.libs/pango-querymodules, \
 		/usr/bin/pango-querymodules)
 
@@ -154,13 +154,13 @@ $(STATEDIR)/pango12.targetinstall: $(pango12_targetinstall_deps_default)
 	cp -a $(CROSS_LIB_DIR)/lib/pango $(ROOTDIR)/usr/lib
 
 	# FIXME: broken path; compare with ptxdist before 0.7.4
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, pango, 0, 0, 0644, \
 		$(ROOTDIR)/usr/lib/pango/$(PANGO_MODULE_VERSION)/modules, 
 		/usr/lib/pango/$(PANGO_MODULE_VERSION)/modules)
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, pango, 0, 0, 0644, \
 		$(PANGO12_DIR)/modules/basic/.libs/*.so, \
 		/usr/lib/pango/$(PANGO_MODULE_VERSION)/modules)
-	@$(call install_finish)
+	@$(call install_finish, pango)
 
 	@$(call touch, $@)
 
diff --git a/rules/pcmcia-cs.make b/rules/pcmcia-cs.make
index d312df3be..458bd88c0 100644
--- a/rules/pcmcia-cs.make
+++ b/rules/pcmcia-cs.make
@@ -119,42 +119,42 @@ pcmcia-cs_targetinstall: $(STATEDIR)/pcmcia-cs.targetinstall
 $(STATEDIR)/pcmcia-cs.targetinstall: $(pcmcia-cs_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,pcmcia-cs)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(PCMCIA-CS_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, pcmcia-cs)
+	@$(call install_fixup, pcmcia-cs,PACKAGE,pcmcia-cs)
+	@$(call install_fixup, pcmcia-cs,PRIORITY,optional)
+	@$(call install_fixup, pcmcia-cs,VERSION,$(PCMCIA-CS_VERSION))
+	@$(call install_fixup, pcmcia-cs,SECTION,base)
+	@$(call install_fixup, pcmcia-cs,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, pcmcia-cs,DEPENDS,)
+	@$(call install_fixup, pcmcia-cs,DESCRIPTION,missing)
 
 ifdef PTXCONF_PCMCIA_TOOLS_CARDMGR
-	@$(call install_copy, 0, 0, 0755, $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/sbin/cardmgr, /sbin/cardmgr)
-	@$(call install_copy, 0, 0, 0755, $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/sbin/cardctl, /sbin/cardctl)
+	@$(call install_copy, pcmcia-cs, 0, 0, 0755, $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/sbin/cardmgr, /sbin/cardmgr)
+	@$(call install_copy, pcmcia-cs, 0, 0, 0755, $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/sbin/cardctl, /sbin/cardctl)
 endif
 
 ifdef PTXCONF_PCMCIA_TOOLS_MISC
 	# FIXME: There are more. Which ones are needed?
-	@$(call install_copy, 0, 0, 0755, $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/sbin/ifport, /sbin/ifport)
-	@$(call install_copy, 0, 0, 0755, $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/sbin/ifuser, /sbin/ifuser)
-	@$(call install_copy, 0, 0, 0755, $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/sbin/ide_info, /sbin/ide_info)
+	@$(call install_copy, pcmcia-cs, 0, 0, 0755, $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/sbin/ifport, /sbin/ifport)
+	@$(call install_copy, pcmcia-cs, 0, 0, 0755, $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/sbin/ifuser, /sbin/ifuser)
+	@$(call install_copy, pcmcia-cs, 0, 0, 0755, $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/sbin/ide_info, /sbin/ide_info)
 endif
 
 ifdef PTXCONF_PCMCIA_TOOLS_FTL
-	@$(call install_copy, 0, 0, 0755, $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/sbin/ftl_format, /sbin/ftl_format)
-	@$(call install_copy, 0, 0, 0755, $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/sbin/ftl_check, /sbin/ftl_check)
+	@$(call install_copy, pcmcia-cs, 0, 0, 0755, $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/sbin/ftl_format, /sbin/ftl_format)
+	@$(call install_copy, pcmcia-cs, 0, 0, 0755, $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/sbin/ftl_check, /sbin/ftl_check)
 endif
 
 ifdef PTXCONF_PCMCIA_TOOLS_DEBUG
-	@$(call install_copy, 0, 0, 0755, $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/sbin/dump_cis, /sbin/dump_cis)
-	@$(call install_copy, 0, 0, 0755, $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/sbin/pack_cis, /sbin/pack_cis)
+	@$(call install_copy, pcmcia-cs, 0, 0, 0755, $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/sbin/dump_cis, /sbin/dump_cis)
+	@$(call install_copy, pcmcia-cs, 0, 0, 0755, $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/sbin/pack_cis, /sbin/pack_cis)
 endif
 
 	# FIXME: Maybe we want to add an install option for  /etc/rc.d/rc.pcmcia
 	#        and all the stuff that goes into /etc/pcmcia
 	#        For now this is a task for vendortweaks.
 
-	@$(call install_finish)
+	@$(call install_finish, pcmcia-cs)
 
 	@$(call touch, $@)
 
diff --git a/rules/pcmciautils.make b/rules/pcmciautils.make
index ca75ecf83..43ac70a99 100644
--- a/rules/pcmciautils.make
+++ b/rules/pcmciautils.make
@@ -114,24 +114,24 @@ pcmciautils_targetinstall: $(STATEDIR)/pcmciautils.targetinstall
 $(STATEDIR)/pcmciautils.targetinstall: $(pcmciautils_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,pcmciautils)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(PCMCIAUTILS_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, pcmciautils)
+	@$(call install_fixup, pcmciautils,PACKAGE,pcmciautils)
+	@$(call install_fixup, pcmciautils,PRIORITY,optional)
+	@$(call install_fixup, pcmciautils,VERSION,$(PCMCIAUTILS_VERSION))
+	@$(call install_fixup, pcmciautils,SECTION,base)
+	@$(call install_fixup, pcmciautils,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, pcmciautils,DEPENDS,)
+	@$(call install_fixup, pcmciautils,DESCRIPTION,missing)
 
 	# install-tools
-	@$(call install_copy, 0, 0, 0755, $(PCMCIAUTILS_DIR)/pccardctl, /sbin/pccardctl);
-	@$(call install_copy, 0, 0, 0755, $(PCMCIAUTILS_DIR)/pcmcia-check-broken-cis, \
+	@$(call install_copy, pcmciautils, 0, 0, 0755, $(PCMCIAUTILS_DIR)/pccardctl, /sbin/pccardctl);
+	@$(call install_copy, pcmciautils, 0, 0, 0755, $(PCMCIAUTILS_DIR)/pcmcia-check-broken-cis, \
 				/sbin/pcmcia-check-broken-cis);
 
 	# install-hotplug
-	@$(call install_copy, 0, 0, 0755, $(PCMCIAUTILS_DIR)/hotplug/pcmcia.agent, \
+	@$(call install_copy, pcmciautils, 0, 0, 0755, $(PCMCIAUTILS_DIR)/hotplug/pcmcia.agent, \
 				/etc/hotplug/pcmcia.agent, n);
-	@$(call install_copy, 0, 0, 0755, $(PCMCIAUTILS_DIR)/hotplug/pcmcia.rc, \
+	@$(call install_copy, pcmciautils, 0, 0, 0755, $(PCMCIAUTILS_DIR)/hotplug/pcmcia.rc, \
 				/etc/hotplug/pcmcia.rc, n);
 
 ifdef PTXCONF_PCMCIAUTILS_STARTUP
@@ -142,17 +142,17 @@ ifdef PTXCONF_PCMCIAUTILS_STARTUP
 	#$(INSTALL_DATA)  -D config/config.opts $(DESTDIR)$(pcmciaconfdir)/config.opts
 
 	# install-socket-hotplug
-	@$(call install_copy, 0, 0, 0755, $(PCMCIAUTILS_DIR)/hotplug/pcmcia_socket.agent, \
+	@$(call install_copy, pcmciautils, 0, 0, 0755, $(PCMCIAUTILS_DIR)/hotplug/pcmcia_socket.agent, \
 				/etc/hotplug/pcmcia_socket.agent, n);
-	@$(call install_copy, 0, 0, 0755, $(PCMCIAUTILS_DIR)/hotplug/pcmcia_socket.rc, \
+	@$(call install_copy, pcmciautils, 0, 0, 0755, $(PCMCIAUTILS_DIR)/hotplug/pcmcia_socket.rc, \
 				/etc/hotplug/pcmcia_socket.rc, n);
 
 	# install-socket-tools
-	@$(call install_copy, 0, 0, 0755, $(PCMCIAUTILS_DIR)/pcmcia-socket-startup, \
+	@$(call install_copy, pcmciautils, 0, 0, 0755, $(PCMCIAUTILS_DIR)/pcmcia-socket-startup, \
 				/sbin/pcmcia-socket-startup);
 endif
 
-	@$(call install_finish)
+	@$(call install_finish, pcmciautils)
 
 	@$(call touch, $@)
 
diff --git a/rules/pcre.make b/rules/pcre.make
index 629d7b64e..66811eed0 100644
--- a/rules/pcre.make
+++ b/rules/pcre.make
@@ -111,23 +111,23 @@ pcre_targetinstall: $(STATEDIR)/pcre.targetinstall
 $(STATEDIR)/pcre.targetinstall: $(pcre_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,pcre)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(PCRE_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, $(PCRE_DIR)/.libs/libpcre.so.0.0.1, /usr/lib/libpcre.so.0.0.1)
-	@$(call install_link, /usr/lib/libpcre.so.0.0.1, /usr/lib/libpcre.so.0) 
-	@$(call install_link, /usr/lib/libpcre.so.0.0.1, /usr/lib/libpcre.so) 
-	@$(call install_copy, 0, 0, 0644, $(PCRE_DIR)/.libs/libpcreposix.so.0.0.0, /usr/lib/libpcreposix.so.0.0.0)
-	@$(call install_link, /usr/lib/libpcreposix.so.0.0.0, /usr/lib/libpcreposix.so.0) 
-	@$(call install_link, /usr/lib/libpcreposix.so.0.0.0, /usr/lib/libpcreposix.so) 
-
-	@$(call install_finish)
+	@$(call install_init, pcre)
+	@$(call install_fixup, pcre,PACKAGE,pcre)
+	@$(call install_fixup, pcre,PRIORITY,optional)
+	@$(call install_fixup, pcre,VERSION,$(PCRE_VERSION))
+	@$(call install_fixup, pcre,SECTION,base)
+	@$(call install_fixup, pcre,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, pcre,DEPENDS,)
+	@$(call install_fixup, pcre,DESCRIPTION,missing)
+
+	@$(call install_copy, pcre, 0, 0, 0644, $(PCRE_DIR)/.libs/libpcre.so.0.0.1, /usr/lib/libpcre.so.0.0.1)
+	@$(call install_link, pcre, /usr/lib/libpcre.so.0.0.1, /usr/lib/libpcre.so.0) 
+	@$(call install_link, pcre, /usr/lib/libpcre.so.0.0.1, /usr/lib/libpcre.so) 
+	@$(call install_copy, pcre, 0, 0, 0644, $(PCRE_DIR)/.libs/libpcreposix.so.0.0.0, /usr/lib/libpcreposix.so.0.0.0)
+	@$(call install_link, pcre, /usr/lib/libpcreposix.so.0.0.0, /usr/lib/libpcreposix.so.0) 
+	@$(call install_link, pcre, /usr/lib/libpcreposix.so.0.0.0, /usr/lib/libpcreposix.so) 
+
+	@$(call install_finish, pcre)
 
 	@$(call touch, $@)
 
diff --git a/rules/pdksh.make b/rules/pdksh.make
index f7183c7f1..6c29d5937 100644
--- a/rules/pdksh.make
+++ b/rules/pdksh.make
@@ -158,18 +158,18 @@ pdksh_targetinstall: $(STATEDIR)/pdksh.targetinstall
 $(STATEDIR)/pdksh.targetinstall: $(pdksh_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,pdksh)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(PDKSH_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, pdksh)
+	@$(call install_fixup, pdksh,PACKAGE,pdksh)
+	@$(call install_fixup, pdksh,PRIORITY,optional)
+	@$(call install_fixup, pdksh,VERSION,$(PDKSH_VERSION))
+	@$(call install_fixup, pdksh,SECTION,base)
+	@$(call install_fixup, pdksh,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, pdksh,DEPENDS,)
+	@$(call install_fixup, pdksh,DESCRIPTION,missing)
 	
-	@$(call install_copy, 0, 0, 0755, $(PDKSH_DIR)/ksh, /bin/ksh)
+	@$(call install_copy, pdksh, 0, 0, 0755, $(PDKSH_DIR)/ksh, /bin/ksh)
 	
-	@$(call install_finish)
+	@$(call install_finish, pdksh)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/penguzilla.make b/rules/penguzilla.make
index cd4f2c974..680aa8d79 100644
--- a/rules/penguzilla.make
+++ b/rules/penguzilla.make
@@ -107,26 +107,26 @@ penguzilla_targetinstall: $(STATEDIR)/penguzilla.targetinstall
 $(STATEDIR)/penguzilla.targetinstall: $(penguzilla_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,penguzilla)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(PENGUZILLA_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, penguzilla)
+	@$(call install_fixup, penguzilla,PACKAGE,penguzilla)
+	@$(call install_fixup, penguzilla,PRIORITY,optional)
+	@$(call install_fixup, penguzilla,VERSION,$(PENGUZILLA_VERSION))
+	@$(call install_fixup, penguzilla,SECTION,base)
+	@$(call install_fixup, penguzilla,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, penguzilla,DEPENDS,)
+	@$(call install_fixup, penguzilla,DESCRIPTION,missing)
 
 # 	# pixmap directory
 	for file in $(PENGUZILLA_DIR)/pixmaps/*; do 						\
-		$(call install_copy, 0, 0, 0644, $$file, /usr/share/penguzilla/pixmaps/)	\
+		$(call install_copy, penguzilla, 0, 0, 0644, $$file, /usr/share/penguzilla/pixmaps/)	\
 	done
 
-	@$(call install_copy, 0, 0, 0755, $(PENGUZILLA_DIR)/src/penguzilla, /usr/bin/penguzilla)
+	@$(call install_copy, penguzilla, 0, 0, 0755, $(PENGUZILLA_DIR)/src/penguzilla, /usr/bin/penguzilla)
 
 # 	# Style
-	@$(call install_copy, 0, 0, 0644, $(PENGUZILLA_DIR)/penguzilla.rc, /usr/share/penguzilla/penguzillarc, n)
+	@$(call install_copy, penguzilla, 0, 0, 0644, $(PENGUZILLA_DIR)/penguzilla.rc, /usr/share/penguzilla/penguzillarc, n)
 
-	@$(call install_finish)
+	@$(call install_finish, penguzilla)
 
 	@$(call touch, $@)
 
diff --git a/rules/php-apc.make b/rules/php-apc.make
index 2e4527bb6..f9f5cdda6 100644
--- a/rules/php-apc.make
+++ b/rules/php-apc.make
@@ -110,18 +110,18 @@ php-apc_targetinstall: $(STATEDIR)/php-apc.targetinstall
 $(STATEDIR)/php-apc.targetinstall: $(php-apc_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,php-apc)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(PHP_APC_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Jiri Nesladek <nesladek\@2n.cz>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, $(PHP_APC_DIR)/modules/apc.so, /usr/lib/php/apc.so)
-
-	@$(call install_finish)
+	@$(call install_init, php-apc)
+	@$(call install_fixup, php-apc,PACKAGE,php-apc)
+	@$(call install_fixup, php-apc,PRIORITY,optional)
+	@$(call install_fixup, php-apc,VERSION,$(PHP_APC_VERSION))
+	@$(call install_fixup, php-apc,SECTION,base)
+	@$(call install_fixup, php-apc,AUTHOR,"Jiri Nesladek <nesladek\@2n.cz>")
+	@$(call install_fixup, php-apc,DEPENDS,)
+	@$(call install_fixup, php-apc,DESCRIPTION,missing)
+
+	@$(call install_copy, php-apc, 0, 0, 0644, $(PHP_APC_DIR)/modules/apc.so, /usr/lib/php/apc.so)
+
+	@$(call install_finish, php-apc)
 
 	@$(call touch, $@)
 
diff --git a/rules/php.make b/rules/php.make
index 7bdc7fb25..9c3304d49 100644
--- a/rules/php.make
+++ b/rules/php.make
@@ -133,25 +133,25 @@ php_targetinstall: $(STATEDIR)/php.targetinstall
 $(STATEDIR)/php.targetinstall: $(php_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,php)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(PHP_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Jiri Nesladek <nesladek\@2n.cz>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, php)
+	@$(call install_fixup, php,PACKAGE,php)
+	@$(call install_fixup, php,PRIORITY,optional)
+	@$(call install_fixup, php,VERSION,$(PHP_VERSION))
+	@$(call install_fixup, php,SECTION,base)
+	@$(call install_fixup, php,AUTHOR,"Jiri Nesladek <nesladek\@2n.cz>")
+	@$(call install_fixup, php,DEPENDS,)
+	@$(call install_fixup, php,DESCRIPTION,missing)
 
-	@$(call install_copy, 0, 0, 0755, /usr/lib/php)
+	@$(call install_copy, php, 0, 0, 0755, /usr/lib/php)
 
 ifdef PTXCONF_PHP_APACHE
-	@$(call install_copy, 0, 0, 0644, $(PHP_DIR)/libs/libphp4.so, /usr/lib/apache/libphp4.so)
+	@$(call install_copy, php, 0, 0, 0644, $(PHP_DIR)/libs/libphp4.so, /usr/lib/apache/libphp4.so)
 endif
 ifdef PTXCONF_PHP_CLI
-	@$(call install_copy, 0, 0, 0755, $(PHP_DIR)/sapi/cli/php, /usr/bin/php)
+	@$(call install_copy, php, 0, 0, 0755, $(PHP_DIR)/sapi/cli/php, /usr/bin/php)
 endif
 
-	@$(call install_finish)
+	@$(call install_finish, php)
 
 	@$(call touch, $@)
 
diff --git a/rules/pnet.make b/rules/pnet.make
index 58e8508e6..eb86f5fa5 100644
--- a/rules/pnet.make
+++ b/rules/pnet.make
@@ -106,19 +106,19 @@ pnet_targetinstall: $(STATEDIR)/pnet.targetinstall
 $(STATEDIR)/pnet.targetinstall: $(pnet_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,pnet)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(PNET_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Benedikt Spranger <b.spranger\@linutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(PNET_DIR)/engine/ilrun, /usr/bin/ilrun)
-	@$(call install_copy, 0, 0, 0755, $(PNET_DIR)/engine/ilverify, /usr/bin/ilverify)
+	@$(call install_init, pnet)
+	@$(call install_fixup, pnet,PACKAGE,pnet)
+	@$(call install_fixup, pnet,PRIORITY,optional)
+	@$(call install_fixup, pnet,VERSION,$(PNET_VERSION))
+	@$(call install_fixup, pnet,SECTION,base)
+	@$(call install_fixup, pnet,AUTHOR,"Benedikt Spranger <b.spranger\@linutronix.de>")
+	@$(call install_fixup, pnet,DEPENDS,)
+	@$(call install_fixup, pnet,DESCRIPTION,missing)
+
+	@$(call install_copy, pnet, 0, 0, 0755, $(PNET_DIR)/engine/ilrun, /usr/bin/ilrun)
+	@$(call install_copy, pnet, 0, 0, 0755, $(PNET_DIR)/engine/ilverify, /usr/bin/ilverify)
 		
-	@$(call install_finish)
+	@$(call install_finish, pnet)
 
 	@$(call touch, $@)
 
diff --git a/rules/pnetlib.make b/rules/pnetlib.make
index 855dc36c5..e7ac44b4f 100644
--- a/rules/pnetlib.make
+++ b/rules/pnetlib.make
@@ -106,18 +106,18 @@ pnetlib_targetinstall: $(STATEDIR)/pnetlib.targetinstall
 $(STATEDIR)/pnetlib.targetinstall: $(pnetlib_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,pnetlib)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(PNETLIB_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <b.spranger\@linutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	#@$(call install_copy, 0, 0, 0755, $(PNETLIB_DIR)/foobar, /dev/null)
-
-	@$(call install_finish)
+	@$(call install_init, pnetlib)
+	@$(call install_fixup, pnetlib,PACKAGE,pnetlib)
+	@$(call install_fixup, pnetlib,PRIORITY,optional)
+	@$(call install_fixup, pnetlib,VERSION,$(PNETLIB_VERSION))
+	@$(call install_fixup, pnetlib,SECTION,base)
+	@$(call install_fixup, pnetlib,AUTHOR,"Robert Schwebel <b.spranger\@linutronix.de>")
+	@$(call install_fixup, pnetlib,DEPENDS,)
+	@$(call install_fixup, pnetlib,DESCRIPTION,missing)
+
+	#@$(call install_copy, pnetlib, 0, 0, 0755, $(PNETLIB_DIR)/foobar, /dev/null)
+
+	@$(call install_finish, pnetlib)
 
 	@$(call touch, $@)
 
diff --git a/rules/pop3spam.make b/rules/pop3spam.make
index f11bc0206..f95fd8c32 100644
--- a/rules/pop3spam.make
+++ b/rules/pop3spam.make
@@ -111,18 +111,18 @@ pop3spam_targetinstall_deps += $(STATEDIR)/pcre.targetinstall
 $(STATEDIR)/pop3spam.targetinstall: $(pop3spam_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 	
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,pop3spam)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(POP3SPAM_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, pop3spam)
+	@$(call install_fixup, pop3spam,PACKAGE,pop3spam)
+	@$(call install_fixup, pop3spam,PRIORITY,optional)
+	@$(call install_fixup, pop3spam,VERSION,$(POP3SPAM_VERSION))
+	@$(call install_fixup, pop3spam,SECTION,base)
+	@$(call install_fixup, pop3spam,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, pop3spam,DEPENDS,)
+	@$(call install_fixup, pop3spam,DESCRIPTION,missing)
 	
-	@$(call install_copy, 0, 0, 0555, $(POP3SPAM_DIR)/src/pop3spam, /usr/bin/pop3spam)
+	@$(call install_copy, pop3spam, 0, 0, 0555, $(POP3SPAM_DIR)/src/pop3spam, /usr/bin/pop3spam)
 
-	@$(call install_finish)
+	@$(call install_finish, pop3spam)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/portmap.make b/rules/portmap.make
index 584714906..81796db58 100644
--- a/rules/portmap.make
+++ b/rules/portmap.make
@@ -108,20 +108,20 @@ portmap_targetinstall: $(STATEDIR)/portmap.targetinstall
 $(STATEDIR)/portmap.targetinstall: $(portmap_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,portmap)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(PORTMAP_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, portmap)
+	@$(call install_fixup, portmap,PACKAGE,portmap)
+	@$(call install_fixup, portmap,PRIORITY,optional)
+	@$(call install_fixup, portmap,VERSION,$(PORTMAP_VERSION))
+	@$(call install_fixup, portmap,SECTION,base)
+	@$(call install_fixup, portmap,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, portmap,DEPENDS,)
+	@$(call install_fixup, portmap,DESCRIPTION,missing)
 
 ifdef PTXCONF_PORTMAP_INSTALL_PORTMAPPER
 
-	@$(call install_copy, 0, 0, 0755, $(PORTMAP_DIR)/portmap, /sbin/portmap)
+	@$(call install_copy, portmap, 0, 0, 0755, $(PORTMAP_DIR)/portmap, /sbin/portmap)
 endif
-	@$(call install_finish)
+	@$(call install_finish, portmap)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/ppp.make b/rules/ppp.make
index 54c9f021f..108ecfdca 100644
--- a/rules/ppp.make
+++ b/rules/ppp.make
@@ -128,19 +128,19 @@ ppp_targetinstall: $(STATEDIR)/ppp.targetinstall
 $(STATEDIR)/ppp.targetinstall: $(ppp_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,ppp)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(PPP_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, ppp)
+	@$(call install_fixup, ppp,PACKAGE,ppp)
+	@$(call install_fixup, ppp,PRIORITY,optional)
+	@$(call install_fixup, ppp,VERSION,$(PPP_VERSION))
+	@$(call install_fixup, ppp,SECTION,base)
+	@$(call install_fixup, ppp,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, ppp,DEPENDS,)
+	@$(call install_fixup, ppp,DESCRIPTION,missing)
 	
-	@$(call install_copy, 0, 0, 0755, $(PPP_DIR)/pppd/pppd, /usr/sbin/pppd)
-	@$(call install_copy, 0, 0, 0755, $(PPP_DIR)/chat/chat, /usr/sbin/chat)
+	@$(call install_copy, ppp, 0, 0, 0755, $(PPP_DIR)/pppd/pppd, /usr/sbin/pppd)
+	@$(call install_copy, ppp, 0, 0, 0755, $(PPP_DIR)/chat/chat, /usr/sbin/chat)
 
-	@$(call install_finish)
+	@$(call install_finish, ppp)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/procps.make b/rules/procps.make
index f73a1e222..617215890 100644
--- a/rules/procps.make
+++ b/rules/procps.make
@@ -122,37 +122,37 @@ procps_targetinstall: $(STATEDIR)/procps.targetinstall
 $(STATEDIR)/procps.targetinstall: $(procps_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,procps)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(PROCPS_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, procps)
+	@$(call install_fixup, procps,PACKAGE,procps)
+	@$(call install_fixup, procps,PRIORITY,optional)
+	@$(call install_fixup, procps,VERSION,$(PROCPS_VERSION))
+	@$(call install_fixup, procps,SECTION,base)
+	@$(call install_fixup, procps,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, procps,DEPENDS,)
+	@$(call install_fixup, procps,DESCRIPTION,missing)
 
-	@$(call install_copy, 0, 0, 0644, $(PROCPS_DIR)/proc/libproc-3.2.4.so, /usr/lib/libproc-3.2.4.so)
+	@$(call install_copy, procps, 0, 0, 0644, $(PROCPS_DIR)/proc/libproc-3.2.4.so, /usr/lib/libproc-3.2.4.so)
 
 ifdef PTXCONF_PROCPS_TOP
-	@$(call install_copy, 0, 0, 0755, $(PROCPS_DIR)/top, /usr/bin/top)
+	@$(call install_copy, procps, 0, 0, 0755, $(PROCPS_DIR)/top, /usr/bin/top)
 endif
 
 ifdef PTXCONF_PROCPS_SLABTOP
-	@$(call install_copy, 0, 0, 0755, $(PROCPS_DIR)/slabtop, /usr/bin/slabtop)
+	@$(call install_copy, procps, 0, 0, 0755, $(PROCPS_DIR)/slabtop, /usr/bin/slabtop)
 endif
 ifdef PTXCONF_PROCPS_SYSCTL
-	@$(call install_copy, 0, 0, 0755, $(PROCPS_DIR)/sysctl, /sbin/sysctl)
+	@$(call install_copy, procps, 0, 0, 0755, $(PROCPS_DIR)/sysctl, /sbin/sysctl)
 endif
 ifdef PTXCONF_PROCPS_PS
-	@$(call install_copy, 0, 0, 0755, $(PROCPS_DIR)/ps/ps, /sbin/ps)
+	@$(call install_copy, procps, 0, 0, 0755, $(PROCPS_DIR)/ps/ps, /sbin/ps)
 endif
 ifdef PTXCONF_PROCPS_W
-	@$(call install_copy, 0, 0, 0755, $(PROCPS_DIR)/w, /sbin/w)
+	@$(call install_copy, procps, 0, 0, 0755, $(PROCPS_DIR)/w, /sbin/w)
 endif
 ifdef PTXCONF_PROCPS_PGREP
-	@$(call install_copy, 0, 0, 0755, $(PROCPS_DIR)/pgrep, /sbin/pgrep)
+	@$(call install_copy, procps, 0, 0, 0755, $(PROCPS_DIR)/pgrep, /sbin/pgrep)
 endif
-	@$(call install_finish)
+	@$(call install_finish, procps)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/proftpd.make b/rules/proftpd.make
index b4aa0ac1b..18a2a6a8b 100644
--- a/rules/proftpd.make
+++ b/rules/proftpd.make
@@ -131,23 +131,23 @@ proftpd_targetinstall: $(STATEDIR)/proftpd.targetinstall
 $(STATEDIR)/proftpd.targetinstall: $(proftpd_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,proftpd)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(PROFTPD_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(PROFTPD_DIR)/proftpd, /usr/sbin/proftpd)
-	@$(call install_copy, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/proftpd, /etc/init.d/proftpd, n)
+	@$(call install_init, proftpd)
+	@$(call install_fixup, proftpd,PACKAGE,proftpd)
+	@$(call install_fixup, proftpd,PRIORITY,optional)
+	@$(call install_fixup, proftpd,VERSION,$(PROFTPD_VERSION))
+	@$(call install_fixup, proftpd,SECTION,base)
+	@$(call install_fixup, proftpd,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, proftpd,DEPENDS,)
+	@$(call install_fixup, proftpd,DESCRIPTION,missing)
+
+	@$(call install_copy, proftpd, 0, 0, 0755, $(PROFTPD_DIR)/proftpd, /usr/sbin/proftpd)
+	@$(call install_copy, proftpd, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/proftpd, /etc/init.d/proftpd, n)
 	
 ifdef $(PTXCONF_PROFTPD_DEFAULTCONFIG)	
-	@$(call install_copy, 11, 101, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/proftpd.conf, /etc/proftpd.conf, n)
+	@$(call install_copy, proftpd, 11, 101, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/proftpd.conf, /etc/proftpd.conf, n)
 endif	
 
-	@$(call install_finish)
+	@$(call install_finish, proftpd)
 
 	@$(call touch, $@)
 
diff --git a/rules/pureftpd.make b/rules/pureftpd.make
index 1bdc79f83..f618ad99d 100644
--- a/rules/pureftpd.make
+++ b/rules/pureftpd.make
@@ -147,40 +147,40 @@ pureftpd_targetinstall: $(STATEDIR)/pureftpd.targetinstall
 $(STATEDIR)/pureftpd.targetinstall: $(pureftpd_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,pureftpd)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(PUREFTPD_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(PUREFTPD_DIR)/src/pure-ftpd, /usr/sbin/pure-ftpd)
+	@$(call install_init, pureftpd)
+	@$(call install_fixup, pureftpd,PACKAGE,pureftpd)
+	@$(call install_fixup, pureftpd,PRIORITY,optional)
+	@$(call install_fixup, pureftpd,VERSION,$(PUREFTPD_VERSION))
+	@$(call install_fixup, pureftpd,SECTION,base)
+	@$(call install_fixup, pureftpd,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, pureftpd,DEPENDS,)
+	@$(call install_fixup, pureftpd,DESCRIPTION,missing)
+
+	@$(call install_copy, pureftpd, 0, 0, 0755, $(PUREFTPD_DIR)/src/pure-ftpd, /usr/sbin/pure-ftpd)
 ifdef PTXCONF_ROOTFS_ETC_INITD_PUREFTPD
 ifneq ($(call remove_quotes,$(PTXCONF_ROOTFS_ETC_INITD_PUREFTPD_USER_FILE)),)
-	@$(call install_copy, 0, 0, 0755, $(PTXCONF_ROOTFS_ETC_INITD_PUREFTPD_USER_FILE), /etc/init.d/pure-ftpd, n)
+	@$(call install_copy, pureftpd, 0, 0, 0755, $(PTXCONF_ROOTFS_ETC_INITD_PUREFTPD_USER_FILE), /etc/init.d/pure-ftpd, n)
 else
-	@$(call install_copy, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/pure-ftpd, /etc/init.d/pure-ftpd, n)
+	@$(call install_copy, pureftpd, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/pure-ftpd, /etc/init.d/pure-ftpd, n)
 endif
 endif
 
 ifneq ($(PTXCONF_ROOTFS_ETC_INITD_PUREFTPD_LINK),"")
-	@$(call install_copy, 0, 0, 0755, /etc/rc.d)
-	@$(call install_link, ../init.d/pure-ftpd, /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_PUREFTPD_LINK))
+	@$(call install_copy, pureftpd, 0, 0, 0755, /etc/rc.d)
+	@$(call install_link, pureftpd, ../init.d/pure-ftpd, /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_PUREFTPD_LINK))
 endif
 
 ifdef PTXCONF_PUREFTPD_UPLOADSCRIPT
-	@$(call install_copy, 0, 0, 0755, $(PUREFTPD_DIR)/src/pure-uploadscript, /usr/sbin/pure-uploadscript, n)
+	@$(call install_copy, pureftpd, 0, 0, 0755, $(PUREFTPD_DIR)/src/pure-uploadscript, /usr/sbin/pure-uploadscript, n)
 endif
 
 
-	@$(call install_finish)
+	@$(call install_finish, pureftpd)
 
 	@$(call touch, $@)
 
 # FIXME: Define a default configuration
-#	@$(call install_copy, 0, 0, 0755, $(PUREFTPD_DIR)/configuration-file/pure-ftpd.conf, /etc/pure-ftpd.defaults)
+#	@$(call install_copy, pureftpd, 0, 0, 0755, $(PUREFTPD_DIR)/configuration-file/pure-ftpd.conf, /etc/pure-ftpd.defaults)
 
 # ----------------------------------------------------------------------------
 # Clean
diff --git a/rules/python.make b/rules/python.make
index 4b8bc13d8..6ea76f087 100644
--- a/rules/python.make
+++ b/rules/python.make
@@ -111,14 +111,14 @@ python_targetinstall: $(STATEDIR)/python.targetinstall
 $(STATEDIR)/python.targetinstall: $(python_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,python)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(PYTHON_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, python)
+	@$(call install_fixup, python,PACKAGE,python)
+	@$(call install_fixup, python,PRIORITY,optional)
+	@$(call install_fixup, python,VERSION,$(PYTHON_VERSION))
+	@$(call install_fixup, python,SECTION,base)
+	@$(call install_fixup, python,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, python,DEPENDS,)
+	@$(call install_fixup, python,DESCRIPTION,missing)
 
 	# FIXME: RSC: ipkgize in a cleaner way
 
@@ -143,7 +143,7 @@ $(STATEDIR)/python.targetinstall: $(python_targetinstall_deps_default)
 	$(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/usr/bin/python2.3
 	$(CROSS_STRIP) -R .note -R .comment $(IMAGEDIR)/ipkg/usr/bin/python2.3
 
-	@$(call install_finish)
+	@$(call install_finish, python)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/python24.make b/rules/python24.make
index 74373a0b7..fc0f6060e 100644
--- a/rules/python24.make
+++ b/rules/python24.make
@@ -113,14 +113,14 @@ python24_targetinstall: $(STATEDIR)/python24.targetinstall
 $(STATEDIR)/python24.targetinstall: $(python24_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,python24)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(PYTHON24_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, python24)
+	@$(call install_fixup, python24,PACKAGE,python24)
+	@$(call install_fixup, python24,PRIORITY,optional)
+	@$(call install_fixup, python24,VERSION,$(PYTHON24_VERSION))
+	@$(call install_fixup, python24,SECTION,base)
+	@$(call install_fixup, python24,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, python24,DEPENDS,)
+	@$(call install_fixup, python24,DESCRIPTION,missing)
 
 	# FIXME: RSC: ipkgize in a cleaner way
 
@@ -164,7 +164,7 @@ $(STATEDIR)/python24.targetinstall: $(python24_targetinstall_deps_default)
 	rm -fr $(ROOTDIR)/usr/lib/python2.4/test
 	rm -fr $(IMAGEDIR)/ipkg/usr/lib/python2.4/test
 
-	@$(call install_finish)
+	@$(call install_finish, python24)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/qte.make b/rules/qte.make
index 592247bef..c6b4da088 100644
--- a/rules/qte.make
+++ b/rules/qte.make
@@ -232,177 +232,177 @@ qte_targetinstall: $(STATEDIR)/qte.targetinstall
 $(STATEDIR)/qte.targetinstall: $(qte_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,qte)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(QTE_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/fixed_120_50.qpf, /usr/qt/lib/fonts/fixed_120_50.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/fixed_120_50_t10.qpf, /usr/qt/lib/fonts/fixed_120_50_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/fixed_120_50_t15.qpf, /usr/qt/lib/fonts/fixed_120_50_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/fixed_120_50_t5.qpf, /usr/qt/lib/fonts/fixed_120_50_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/fixed_70_50.qpf, /usr/qt/lib/fonts/fixed_70_50.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/fixed_70_50_t10.qpf, /usr/qt/lib/fonts/fixed_70_50_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/fixed_70_50_t15.qpf, /usr/qt/lib/fonts/fixed_70_50_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/fixed_70_50_t5.qpf, /usr/qt/lib/fonts/fixed_70_50_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_100_50.qpf, /usr/qt/lib/fonts/helvetica_100_50.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_100_50_t10.qpf, /usr/qt/lib/fonts/helvetica_100_50_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_100_50_t15.qpf, /usr/qt/lib/fonts/helvetica_100_50_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_100_50_t5.qpf, /usr/qt/lib/fonts/helvetica_100_50_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_100_50i.qpf, /usr/qt/lib/fonts/helvetica_100_50i.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_100_50i_t10.qpf, /usr/qt/lib/fonts/helvetica_100_50i_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_100_50i_t15.qpf, /usr/qt/lib/fonts/helvetica_100_50i_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_100_50i_t5.qpf, /usr/qt/lib/fonts/helvetica_100_50i_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_100_75.qpf, /usr/qt/lib/fonts/helvetica_100_75.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_100_75_t10.qpf, /usr/qt/lib/fonts/helvetica_100_75_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_100_75_t15.qpf, /usr/qt/lib/fonts/helvetica_100_75_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_100_75_t5.qpf, /usr/qt/lib/fonts/helvetica_100_75_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_100_75i.qpf, /usr/qt/lib/fonts/helvetica_100_75i.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_100_75i_t10.qpf, /usr/qt/lib/fonts/helvetica_100_75i_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_100_75i_t15.qpf, /usr/qt/lib/fonts/helvetica_100_75i_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_100_75i_t5.qpf, /usr/qt/lib/fonts/helvetica_100_75i_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_120_50.qpf, /usr/qt/lib/fonts/helvetica_120_50.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_120_50_t10.qpf, /usr/qt/lib/fonts/helvetica_120_50_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_120_50_t15.qpf, /usr/qt/lib/fonts/helvetica_120_50_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_120_50_t5.qpf, /usr/qt/lib/fonts/helvetica_120_50_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_120_50i.qpf, /usr/qt/lib/fonts/helvetica_120_50i.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_120_50i_t10.qpf, /usr/qt/lib/fonts/helvetica_120_50i_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_120_50i_t15.qpf, /usr/qt/lib/fonts/helvetica_120_50i_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_120_50i_t5.qpf, /usr/qt/lib/fonts/helvetica_120_50i_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_120_75.qpf, /usr/qt/lib/fonts/helvetica_120_75.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_120_75_t10.qpf, /usr/qt/lib/fonts/helvetica_120_75_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_120_75_t15.qpf, /usr/qt/lib/fonts/helvetica_120_75_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_120_75_t5.qpf, /usr/qt/lib/fonts/helvetica_120_75_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_120_75i.qpf, /usr/qt/lib/fonts/helvetica_120_75i.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_120_75i_t10.qpf, /usr/qt/lib/fonts/helvetica_120_75i_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_120_75i_t15.qpf, /usr/qt/lib/fonts/helvetica_120_75i_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_120_75i_t5.qpf, /usr/qt/lib/fonts/helvetica_120_75i_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_140_50.qpf, /usr/qt/lib/fonts/helvetica_140_50.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_140_50_t10.qpf, /usr/qt/lib/fonts/helvetica_140_50_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_140_50_t15.qpf, /usr/qt/lib/fonts/helvetica_140_50_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_140_50_t5.qpf, /usr/qt/lib/fonts/helvetica_140_50_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_140_50i.qpf, /usr/qt/lib/fonts/helvetica_140_50i.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_140_50i_t10.qpf, /usr/qt/lib/fonts/helvetica_140_50i_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_140_50i_t15.qpf, /usr/qt/lib/fonts/helvetica_140_50i_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_140_50i_t5.qpf, /usr/qt/lib/fonts/helvetica_140_50i_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_140_75.qpf, /usr/qt/lib/fonts/helvetica_140_75.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_140_75_t10.qpf, /usr/qt/lib/fonts/helvetica_140_75_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_140_75_t15.qpf, /usr/qt/lib/fonts/helvetica_140_75_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_140_75_t5.qpf, /usr/qt/lib/fonts/helvetica_140_75_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_140_75i.qpf, /usr/qt/lib/fonts/helvetica_140_75i.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_140_75i_t10.qpf, /usr/qt/lib/fonts/helvetica_140_75i_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_140_75i_t15.qpf, /usr/qt/lib/fonts/helvetica_140_75i_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_140_75i_t5.qpf, /usr/qt/lib/fonts/helvetica_140_75i_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_180_50.qpf, /usr/qt/lib/fonts/helvetica_180_50.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_180_50_t10.qpf, /usr/qt/lib/fonts/helvetica_180_50_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_180_50_t15.qpf, /usr/qt/lib/fonts/helvetica_180_50_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_180_50_t5.qpf, /usr/qt/lib/fonts/helvetica_180_50_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_180_50i.qpf, /usr/qt/lib/fonts/helvetica_180_50i.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_180_50i_t10.qpf, /usr/qt/lib/fonts/helvetica_180_50i_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_180_50i_t15.qpf, /usr/qt/lib/fonts/helvetica_180_50i_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_180_50i_t5.qpf, /usr/qt/lib/fonts/helvetica_180_50i_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_180_75.qpf, /usr/qt/lib/fonts/helvetica_180_75.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_180_75_t10.qpf, /usr/qt/lib/fonts/helvetica_180_75_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_180_75_t15.qpf, /usr/qt/lib/fonts/helvetica_180_75_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_180_75_t5.qpf, /usr/qt/lib/fonts/helvetica_180_75_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_180_75i.qpf, /usr/qt/lib/fonts/helvetica_180_75i.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_180_75i_t10.qpf, /usr/qt/lib/fonts/helvetica_180_75i_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_180_75i_t15.qpf, /usr/qt/lib/fonts/helvetica_180_75i_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_180_75i_t5.qpf, /usr/qt/lib/fonts/helvetica_180_75i_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_240_50.qpf, /usr/qt/lib/fonts/helvetica_240_50.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_240_50_t10.qpf, /usr/qt/lib/fonts/helvetica_240_50_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_240_50_t15.qpf, /usr/qt/lib/fonts/helvetica_240_50_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_240_50_t5.qpf, /usr/qt/lib/fonts/helvetica_240_50_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_240_50i.qpf, /usr/qt/lib/fonts/helvetica_240_50i.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_240_50i_t10.qpf, /usr/qt/lib/fonts/helvetica_240_50i_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_240_50i_t15.qpf, /usr/qt/lib/fonts/helvetica_240_50i_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_240_50i_t5.qpf, /usr/qt/lib/fonts/helvetica_240_50i_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_240_75.qpf, /usr/qt/lib/fonts/helvetica_240_75.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_240_75_t10.qpf, /usr/qt/lib/fonts/helvetica_240_75_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_240_75_t15.qpf, /usr/qt/lib/fonts/helvetica_240_75_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_240_75_t5.qpf, /usr/qt/lib/fonts/helvetica_240_75_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_240_75i.qpf, /usr/qt/lib/fonts/helvetica_240_75i.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_240_75i_t10.qpf, /usr/qt/lib/fonts/helvetica_240_75i_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_240_75i_t15.qpf, /usr/qt/lib/fonts/helvetica_240_75i_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_240_75i_t5.qpf, /usr/qt/lib/fonts/helvetica_240_75i_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_80_50.qpf, /usr/qt/lib/fonts/helvetica_80_50.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_80_50_t10.qpf, /usr/qt/lib/fonts/helvetica_80_50_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_80_50_t15.qpf, /usr/qt/lib/fonts/helvetica_80_50_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_80_50_t5.qpf, /usr/qt/lib/fonts/helvetica_80_50_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_80_50i.qpf, /usr/qt/lib/fonts/helvetica_80_50i.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_80_50i_t10.qpf, /usr/qt/lib/fonts/helvetica_80_50i_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_80_50i_t15.qpf, /usr/qt/lib/fonts/helvetica_80_50i_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_80_50i_t5.qpf, /usr/qt/lib/fonts/helvetica_80_50i_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_80_75.qpf, /usr/qt/lib/fonts/helvetica_80_75.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_80_75_t10.qpf, /usr/qt/lib/fonts/helvetica_80_75_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_80_75_t15.qpf, /usr/qt/lib/fonts/helvetica_80_75_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_80_75_t5.qpf, /usr/qt/lib/fonts/helvetica_80_75_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_80_75i.qpf, /usr/qt/lib/fonts/helvetica_80_75i.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_80_75i_t10.qpf, /usr/qt/lib/fonts/helvetica_80_75i_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_80_75i_t15.qpf, /usr/qt/lib/fonts/helvetica_80_75i_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_80_75i_t5.qpf, /usr/qt/lib/fonts/helvetica_80_75i_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/micro_40_50.qpf, /usr/qt/lib/fonts/micro_40_50.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/micro_40_50_t10.qpf, /usr/qt/lib/fonts/micro_40_50_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/micro_40_50_t15.qpf, /usr/qt/lib/fonts/micro_40_50_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/micro_40_50_t5.qpf, /usr/qt/lib/fonts/micro_40_50_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smallsmooth_90_50.qpf, /usr/qt/lib/fonts/smallsmooth_90_50.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smallsmooth_90_50_t10.qpf, /usr/qt/lib/fonts/smallsmooth_90_50_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smallsmooth_90_50_t15.qpf, /usr/qt/lib/fonts/smallsmooth_90_50_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smallsmooth_90_50_t5.qpf, /usr/qt/lib/fonts/smallsmooth_90_50_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_100_50.qpf, /usr/qt/lib/fonts/smoothtimes_100_50.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_100_50_t10.qpf, /usr/qt/lib/fonts/smoothtimes_100_50_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_100_50_t15.qpf, /usr/qt/lib/fonts/smoothtimes_100_50_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_100_50_t5.qpf, /usr/qt/lib/fonts/smoothtimes_100_50_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_160_50.qpf, /usr/qt/lib/fonts/smoothtimes_160_50.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_160_50_t10.qpf, /usr/qt/lib/fonts/smoothtimes_160_50_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_160_50_t15.qpf, /usr/qt/lib/fonts/smoothtimes_160_50_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_160_50_t5.qpf, /usr/qt/lib/fonts/smoothtimes_160_50_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_170_50.qpf, /usr/qt/lib/fonts/smoothtimes_170_50.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_170_50_t10.qpf, /usr/qt/lib/fonts/smoothtimes_170_50_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_170_50_t15.qpf, /usr/qt/lib/fonts/smoothtimes_170_50_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_170_50_t5.qpf, /usr/qt/lib/fonts/smoothtimes_170_50_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_170_75.qpf, /usr/qt/lib/fonts/smoothtimes_170_75.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_170_75_t10.qpf, /usr/qt/lib/fonts/smoothtimes_170_75_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_170_75_t15.qpf, /usr/qt/lib/fonts/smoothtimes_170_75_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_170_75_t5.qpf, /usr/qt/lib/fonts/smoothtimes_170_75_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_220_50.qpf, /usr/qt/lib/fonts/smoothtimes_220_50.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_220_50_t10.qpf, /usr/qt/lib/fonts/smoothtimes_220_50_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_220_50_t15.qpf, /usr/qt/lib/fonts/smoothtimes_220_50_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_220_50_t5.qpf, /usr/qt/lib/fonts/smoothtimes_220_50_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_250_75.qpf, /usr/qt/lib/fonts/smoothtimes_250_75.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_250_75_t10.qpf, /usr/qt/lib/fonts/smoothtimes_250_75_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_250_75_t15.qpf, /usr/qt/lib/fonts/smoothtimes_250_75_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_250_75_t5.qpf, /usr/qt/lib/fonts/smoothtimes_250_75_t5.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_440_75.qpf, /usr/qt/lib/fonts/smoothtimes_440_75.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_440_75_t10.qpf, /usr/qt/lib/fonts/smoothtimes_440_75_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_440_75_t15.qpf, /usr/qt/lib/fonts/smoothtimes_440_75_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_440_75_t5.qpf, /usr/qt/lib/fonts/smoothtimes_440_75_t5.qpf, 0)
+	@$(call install_init, qte)
+	@$(call install_fixup, qte,PACKAGE,qte)
+	@$(call install_fixup, qte,PRIORITY,optional)
+	@$(call install_fixup, qte,VERSION,$(QTE_VERSION))
+	@$(call install_fixup, qte,SECTION,base)
+	@$(call install_fixup, qte,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, qte,DEPENDS,)
+	@$(call install_fixup, qte,DESCRIPTION,missing)
+
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/fixed_120_50.qpf, /usr/qt/lib/fonts/fixed_120_50.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/fixed_120_50_t10.qpf, /usr/qt/lib/fonts/fixed_120_50_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/fixed_120_50_t15.qpf, /usr/qt/lib/fonts/fixed_120_50_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/fixed_120_50_t5.qpf, /usr/qt/lib/fonts/fixed_120_50_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/fixed_70_50.qpf, /usr/qt/lib/fonts/fixed_70_50.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/fixed_70_50_t10.qpf, /usr/qt/lib/fonts/fixed_70_50_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/fixed_70_50_t15.qpf, /usr/qt/lib/fonts/fixed_70_50_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/fixed_70_50_t5.qpf, /usr/qt/lib/fonts/fixed_70_50_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_100_50.qpf, /usr/qt/lib/fonts/helvetica_100_50.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_100_50_t10.qpf, /usr/qt/lib/fonts/helvetica_100_50_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_100_50_t15.qpf, /usr/qt/lib/fonts/helvetica_100_50_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_100_50_t5.qpf, /usr/qt/lib/fonts/helvetica_100_50_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_100_50i.qpf, /usr/qt/lib/fonts/helvetica_100_50i.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_100_50i_t10.qpf, /usr/qt/lib/fonts/helvetica_100_50i_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_100_50i_t15.qpf, /usr/qt/lib/fonts/helvetica_100_50i_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_100_50i_t5.qpf, /usr/qt/lib/fonts/helvetica_100_50i_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_100_75.qpf, /usr/qt/lib/fonts/helvetica_100_75.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_100_75_t10.qpf, /usr/qt/lib/fonts/helvetica_100_75_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_100_75_t15.qpf, /usr/qt/lib/fonts/helvetica_100_75_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_100_75_t5.qpf, /usr/qt/lib/fonts/helvetica_100_75_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_100_75i.qpf, /usr/qt/lib/fonts/helvetica_100_75i.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_100_75i_t10.qpf, /usr/qt/lib/fonts/helvetica_100_75i_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_100_75i_t15.qpf, /usr/qt/lib/fonts/helvetica_100_75i_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_100_75i_t5.qpf, /usr/qt/lib/fonts/helvetica_100_75i_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_120_50.qpf, /usr/qt/lib/fonts/helvetica_120_50.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_120_50_t10.qpf, /usr/qt/lib/fonts/helvetica_120_50_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_120_50_t15.qpf, /usr/qt/lib/fonts/helvetica_120_50_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_120_50_t5.qpf, /usr/qt/lib/fonts/helvetica_120_50_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_120_50i.qpf, /usr/qt/lib/fonts/helvetica_120_50i.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_120_50i_t10.qpf, /usr/qt/lib/fonts/helvetica_120_50i_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_120_50i_t15.qpf, /usr/qt/lib/fonts/helvetica_120_50i_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_120_50i_t5.qpf, /usr/qt/lib/fonts/helvetica_120_50i_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_120_75.qpf, /usr/qt/lib/fonts/helvetica_120_75.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_120_75_t10.qpf, /usr/qt/lib/fonts/helvetica_120_75_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_120_75_t15.qpf, /usr/qt/lib/fonts/helvetica_120_75_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_120_75_t5.qpf, /usr/qt/lib/fonts/helvetica_120_75_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_120_75i.qpf, /usr/qt/lib/fonts/helvetica_120_75i.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_120_75i_t10.qpf, /usr/qt/lib/fonts/helvetica_120_75i_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_120_75i_t15.qpf, /usr/qt/lib/fonts/helvetica_120_75i_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_120_75i_t5.qpf, /usr/qt/lib/fonts/helvetica_120_75i_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_140_50.qpf, /usr/qt/lib/fonts/helvetica_140_50.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_140_50_t10.qpf, /usr/qt/lib/fonts/helvetica_140_50_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_140_50_t15.qpf, /usr/qt/lib/fonts/helvetica_140_50_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_140_50_t5.qpf, /usr/qt/lib/fonts/helvetica_140_50_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_140_50i.qpf, /usr/qt/lib/fonts/helvetica_140_50i.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_140_50i_t10.qpf, /usr/qt/lib/fonts/helvetica_140_50i_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_140_50i_t15.qpf, /usr/qt/lib/fonts/helvetica_140_50i_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_140_50i_t5.qpf, /usr/qt/lib/fonts/helvetica_140_50i_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_140_75.qpf, /usr/qt/lib/fonts/helvetica_140_75.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_140_75_t10.qpf, /usr/qt/lib/fonts/helvetica_140_75_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_140_75_t15.qpf, /usr/qt/lib/fonts/helvetica_140_75_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_140_75_t5.qpf, /usr/qt/lib/fonts/helvetica_140_75_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_140_75i.qpf, /usr/qt/lib/fonts/helvetica_140_75i.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_140_75i_t10.qpf, /usr/qt/lib/fonts/helvetica_140_75i_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_140_75i_t15.qpf, /usr/qt/lib/fonts/helvetica_140_75i_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_140_75i_t5.qpf, /usr/qt/lib/fonts/helvetica_140_75i_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_180_50.qpf, /usr/qt/lib/fonts/helvetica_180_50.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_180_50_t10.qpf, /usr/qt/lib/fonts/helvetica_180_50_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_180_50_t15.qpf, /usr/qt/lib/fonts/helvetica_180_50_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_180_50_t5.qpf, /usr/qt/lib/fonts/helvetica_180_50_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_180_50i.qpf, /usr/qt/lib/fonts/helvetica_180_50i.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_180_50i_t10.qpf, /usr/qt/lib/fonts/helvetica_180_50i_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_180_50i_t15.qpf, /usr/qt/lib/fonts/helvetica_180_50i_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_180_50i_t5.qpf, /usr/qt/lib/fonts/helvetica_180_50i_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_180_75.qpf, /usr/qt/lib/fonts/helvetica_180_75.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_180_75_t10.qpf, /usr/qt/lib/fonts/helvetica_180_75_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_180_75_t15.qpf, /usr/qt/lib/fonts/helvetica_180_75_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_180_75_t5.qpf, /usr/qt/lib/fonts/helvetica_180_75_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_180_75i.qpf, /usr/qt/lib/fonts/helvetica_180_75i.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_180_75i_t10.qpf, /usr/qt/lib/fonts/helvetica_180_75i_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_180_75i_t15.qpf, /usr/qt/lib/fonts/helvetica_180_75i_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_180_75i_t5.qpf, /usr/qt/lib/fonts/helvetica_180_75i_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_240_50.qpf, /usr/qt/lib/fonts/helvetica_240_50.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_240_50_t10.qpf, /usr/qt/lib/fonts/helvetica_240_50_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_240_50_t15.qpf, /usr/qt/lib/fonts/helvetica_240_50_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_240_50_t5.qpf, /usr/qt/lib/fonts/helvetica_240_50_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_240_50i.qpf, /usr/qt/lib/fonts/helvetica_240_50i.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_240_50i_t10.qpf, /usr/qt/lib/fonts/helvetica_240_50i_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_240_50i_t15.qpf, /usr/qt/lib/fonts/helvetica_240_50i_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_240_50i_t5.qpf, /usr/qt/lib/fonts/helvetica_240_50i_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_240_75.qpf, /usr/qt/lib/fonts/helvetica_240_75.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_240_75_t10.qpf, /usr/qt/lib/fonts/helvetica_240_75_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_240_75_t15.qpf, /usr/qt/lib/fonts/helvetica_240_75_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_240_75_t5.qpf, /usr/qt/lib/fonts/helvetica_240_75_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_240_75i.qpf, /usr/qt/lib/fonts/helvetica_240_75i.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_240_75i_t10.qpf, /usr/qt/lib/fonts/helvetica_240_75i_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_240_75i_t15.qpf, /usr/qt/lib/fonts/helvetica_240_75i_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_240_75i_t5.qpf, /usr/qt/lib/fonts/helvetica_240_75i_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_80_50.qpf, /usr/qt/lib/fonts/helvetica_80_50.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_80_50_t10.qpf, /usr/qt/lib/fonts/helvetica_80_50_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_80_50_t15.qpf, /usr/qt/lib/fonts/helvetica_80_50_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_80_50_t5.qpf, /usr/qt/lib/fonts/helvetica_80_50_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_80_50i.qpf, /usr/qt/lib/fonts/helvetica_80_50i.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_80_50i_t10.qpf, /usr/qt/lib/fonts/helvetica_80_50i_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_80_50i_t15.qpf, /usr/qt/lib/fonts/helvetica_80_50i_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_80_50i_t5.qpf, /usr/qt/lib/fonts/helvetica_80_50i_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_80_75.qpf, /usr/qt/lib/fonts/helvetica_80_75.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_80_75_t10.qpf, /usr/qt/lib/fonts/helvetica_80_75_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_80_75_t15.qpf, /usr/qt/lib/fonts/helvetica_80_75_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_80_75_t5.qpf, /usr/qt/lib/fonts/helvetica_80_75_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_80_75i.qpf, /usr/qt/lib/fonts/helvetica_80_75i.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_80_75i_t10.qpf, /usr/qt/lib/fonts/helvetica_80_75i_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_80_75i_t15.qpf, /usr/qt/lib/fonts/helvetica_80_75i_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/helvetica_80_75i_t5.qpf, /usr/qt/lib/fonts/helvetica_80_75i_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/micro_40_50.qpf, /usr/qt/lib/fonts/micro_40_50.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/micro_40_50_t10.qpf, /usr/qt/lib/fonts/micro_40_50_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/micro_40_50_t15.qpf, /usr/qt/lib/fonts/micro_40_50_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/micro_40_50_t5.qpf, /usr/qt/lib/fonts/micro_40_50_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smallsmooth_90_50.qpf, /usr/qt/lib/fonts/smallsmooth_90_50.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smallsmooth_90_50_t10.qpf, /usr/qt/lib/fonts/smallsmooth_90_50_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smallsmooth_90_50_t15.qpf, /usr/qt/lib/fonts/smallsmooth_90_50_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smallsmooth_90_50_t5.qpf, /usr/qt/lib/fonts/smallsmooth_90_50_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_100_50.qpf, /usr/qt/lib/fonts/smoothtimes_100_50.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_100_50_t10.qpf, /usr/qt/lib/fonts/smoothtimes_100_50_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_100_50_t15.qpf, /usr/qt/lib/fonts/smoothtimes_100_50_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_100_50_t5.qpf, /usr/qt/lib/fonts/smoothtimes_100_50_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_160_50.qpf, /usr/qt/lib/fonts/smoothtimes_160_50.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_160_50_t10.qpf, /usr/qt/lib/fonts/smoothtimes_160_50_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_160_50_t15.qpf, /usr/qt/lib/fonts/smoothtimes_160_50_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_160_50_t5.qpf, /usr/qt/lib/fonts/smoothtimes_160_50_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_170_50.qpf, /usr/qt/lib/fonts/smoothtimes_170_50.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_170_50_t10.qpf, /usr/qt/lib/fonts/smoothtimes_170_50_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_170_50_t15.qpf, /usr/qt/lib/fonts/smoothtimes_170_50_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_170_50_t5.qpf, /usr/qt/lib/fonts/smoothtimes_170_50_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_170_75.qpf, /usr/qt/lib/fonts/smoothtimes_170_75.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_170_75_t10.qpf, /usr/qt/lib/fonts/smoothtimes_170_75_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_170_75_t15.qpf, /usr/qt/lib/fonts/smoothtimes_170_75_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_170_75_t5.qpf, /usr/qt/lib/fonts/smoothtimes_170_75_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_220_50.qpf, /usr/qt/lib/fonts/smoothtimes_220_50.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_220_50_t10.qpf, /usr/qt/lib/fonts/smoothtimes_220_50_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_220_50_t15.qpf, /usr/qt/lib/fonts/smoothtimes_220_50_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_220_50_t5.qpf, /usr/qt/lib/fonts/smoothtimes_220_50_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_250_75.qpf, /usr/qt/lib/fonts/smoothtimes_250_75.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_250_75_t10.qpf, /usr/qt/lib/fonts/smoothtimes_250_75_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_250_75_t15.qpf, /usr/qt/lib/fonts/smoothtimes_250_75_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_250_75_t5.qpf, /usr/qt/lib/fonts/smoothtimes_250_75_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_440_75.qpf, /usr/qt/lib/fonts/smoothtimes_440_75.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_440_75_t10.qpf, /usr/qt/lib/fonts/smoothtimes_440_75_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_440_75_t15.qpf, /usr/qt/lib/fonts/smoothtimes_440_75_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/smoothtimes_440_75_t5.qpf, /usr/qt/lib/fonts/smoothtimes_440_75_t5.qpf, 0)
 ifdef PTXCONF_QTE_INSTALL_UNIFONT
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/unifont_160_50.qpf, /usr/qt/lib/fonts/unifont_160_50.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/unifont_160_50_t10.qpf, /usr/qt/lib/fonts/unifont_160_50_t10.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/unifont_160_50_t15.qpf, /usr/qt/lib/fonts/unifont_160_50_t15.qpf, 0)
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/unifont_160_50_t5.qpf, /usr/qt/lib/fonts/unifont_160_50_t5.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/unifont_160_50.qpf, /usr/qt/lib/fonts/unifont_160_50.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/unifont_160_50_t10.qpf, /usr/qt/lib/fonts/unifont_160_50_t10.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/unifont_160_50_t15.qpf, /usr/qt/lib/fonts/unifont_160_50_t15.qpf, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/unifont_160_50_t5.qpf, /usr/qt/lib/fonts/unifont_160_50_t5.qpf, 0)
 endif
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/fonts/fontdir, /usr/qt/lib/fonts/fontdir, 0)
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/fonts/fontdir, /usr/qt/lib/fonts/fontdir, 0)
 ifdef PTXCONF_QTE_SHARED
 ifdef PTXCONF_QTE_THREAD
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/libqte-mt.so.$(QTE_VERSION), /lib/libqte-mt.so.$(QTE_VERSION))
-	@$(call install_link, libqte-mt.so.$(QTE_VERSION), /lib/libqte-mt.so)
-	@$(call install_link, libqte-mt.so.$(QTE_VERSION), /lib/libqte-mt.so.$(QTE_MAJOR))
-	@$(call install_link, libqte-mt.so.$(QTE_VERSION), /lib/libqte-mt.so.$(QTE_MAJOR).$(QTE_MINOR))
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/libqte-mt.so.$(QTE_VERSION), /lib/libqte-mt.so.$(QTE_VERSION))
+	@$(call install_link, qte, libqte-mt.so.$(QTE_VERSION), /lib/libqte-mt.so)
+	@$(call install_link, qte, libqte-mt.so.$(QTE_VERSION), /lib/libqte-mt.so.$(QTE_MAJOR))
+	@$(call install_link, qte, libqte-mt.so.$(QTE_VERSION), /lib/libqte-mt.so.$(QTE_MAJOR).$(QTE_MINOR))
 else
-	@$(call install_copy, 0, 0, 0755, $(QTE_DIR)/lib/libqte.so.$(QTE_VERSION), /lib/libqte.so.$(QTE_VERSION))
-	@$(call install_link, libqte.so.$(QTE_VERSION), /lib/libqte.so)
-	@$(call install_link, libqte.so.$(QTE_VERSION), /lib/libqte.so.$(QTE_MAJOR))
-	@$(call install_link, libqte.so.$(QTE_VERSION), /lib/libqte.so.$(QTE_MAJOR).$(QTE_MINOR))
+	@$(call install_copy, qte, 0, 0, 0755, $(QTE_DIR)/lib/libqte.so.$(QTE_VERSION), /lib/libqte.so.$(QTE_VERSION))
+	@$(call install_link, qte, libqte.so.$(QTE_VERSION), /lib/libqte.so)
+	@$(call install_link, qte, libqte.so.$(QTE_VERSION), /lib/libqte.so.$(QTE_MAJOR))
+	@$(call install_link, qte, libqte.so.$(QTE_VERSION), /lib/libqte.so.$(QTE_MAJOR).$(QTE_MINOR))
 endif
 endif
 
-	@$(call install_finish)
+	@$(call install_finish, qte)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/rawrec.make b/rules/rawrec.make
index 2e673edfd..8f75bdbef 100644
--- a/rules/rawrec.make
+++ b/rules/rawrec.make
@@ -107,22 +107,22 @@ rawrec_targetinstall: $(STATEDIR)/rawrec.targetinstall
 $(STATEDIR)/rawrec.targetinstall: $(rawrec_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,rawrec)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(RAWREC_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, rawrec)
+	@$(call install_fixup, rawrec,PACKAGE,rawrec)
+	@$(call install_fixup, rawrec,PRIORITY,optional)
+	@$(call install_fixup, rawrec,VERSION,$(RAWREC_VERSION))
+	@$(call install_fixup, rawrec,SECTION,base)
+	@$(call install_fixup, rawrec,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, rawrec,DEPENDS,)
+	@$(call install_fixup, rawrec,DESCRIPTION,missing)
 
 ifdef PTXCONF_RAWREC_RAWREC
-	@$(call install_copy, 0, 0, 0755, $(RAWREC_DIR)/src/rawrec, /usr/bin/rawrec)
+	@$(call install_copy, rawrec, 0, 0, 0755, $(RAWREC_DIR)/src/rawrec, /usr/bin/rawrec)
 endif
 ifdef PTXCONF_RAWREC_RAWPLAY
-	@$(call install_copy, 0, 0, 0755, $(RAWREC_DIR)/src/rawplay, /usr/bin/rawplay)
+	@$(call install_copy, rawrec, 0, 0, 0755, $(RAWREC_DIR)/src/rawplay, /usr/bin/rawplay)
 endif
-	@$(call install_finish)
+	@$(call install_finish, rawrec)
 
 	@$(call touch, $@)
 
diff --git a/rules/readline.make b/rules/readline.make
index 4d14c5016..6b9bb6aba 100644
--- a/rules/readline.make
+++ b/rules/readline.make
@@ -110,20 +110,20 @@ readline_targetinstall: $(STATEDIR)/readline.targetinstall
 $(STATEDIR)/readline.targetinstall: $(readline_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,readline)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(READLINE_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, $(READLINE_DIR)/shlib/libreadline.so.5.0, /lib/libreadline.so.5.0)
-	@$(call install_link, libreadline.so.5.0, /lib/libreadline.so.5)
-	@$(call install_link, libreadline.so.5.0, /lib/libreadline.so)
-
-	@$(call install_finish)
+	@$(call install_init, readline)
+	@$(call install_fixup, readline,PACKAGE,readline)
+	@$(call install_fixup, readline,PRIORITY,optional)
+	@$(call install_fixup, readline,VERSION,$(READLINE_VERSION))
+	@$(call install_fixup, readline,SECTION,base)
+	@$(call install_fixup, readline,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, readline,DEPENDS,)
+	@$(call install_fixup, readline,DESCRIPTION,missing)
+
+	@$(call install_copy, readline, 0, 0, 0644, $(READLINE_DIR)/shlib/libreadline.so.5.0, /lib/libreadline.so.5.0)
+	@$(call install_link, readline, libreadline.so.5.0, /lib/libreadline.so.5)
+	@$(call install_link, readline, libreadline.so.5.0, /lib/libreadline.so)
+
+	@$(call install_finish, readline)
 
 	@$(call touch, $@)
 
diff --git a/rules/rootfs.make b/rules/rootfs.make
index ca9e84f02..e9a4dc83f 100644
--- a/rules/rootfs.make
+++ b/rules/rootfs.make
@@ -77,83 +77,83 @@ rootfs_targetinstall: $(STATEDIR)/rootfs.targetinstall
 $(STATEDIR)/rootfs.targetinstall: $(rootfs_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,rootfs)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(ROOTFS_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, rootfs)
+	@$(call install_fixup, rootfs,PACKAGE,rootfs)
+	@$(call install_fixup, rootfs,PRIORITY,optional)
+	@$(call install_fixup, rootfs,VERSION,$(ROOTFS_VERSION))
+	@$(call install_fixup, rootfs,SECTION,base)
+	@$(call install_fixup, rootfs,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, rootfs,DEPENDS,)
+	@$(call install_fixup, rootfs,DESCRIPTION,missing)
 
 	#
 	# root filesystem population
 	#
 
 ifdef PTXCONF_ROOTFS_DEV
-	@$(call install_copy, 0, 0, 0755, /dev)
+	@$(call install_copy, rootfs, 0, 0, 0755, /dev)
 endif
 ifdef PTXCONF_ROOTFS_DEV_PTS
-	@$(call install_copy, 0, 0, 0755, /dev/pts)
+	@$(call install_copy, rootfs, 0, 0, 0755, /dev/pts)
 endif
 ifdef PTXCONF_ROOTFS_HOME
-	@$(call install_copy, 0, 0, 2775, /home)
+	@$(call install_copy, rootfs, 0, 0, 2775, /home)
 endif
 ifdef PTXCONF_ROOTFS_MEDIA
 ifneq ($(PTXCONF_ROOTFS_MEDIA1),"")
-	@$(call install_copy, 0, 0, 0777, /media/$(PTXCONF_ROOTFS_MEDIA1))
+	@$(call install_copy, rootfs, 0, 0, 0777, /media/$(PTXCONF_ROOTFS_MEDIA1))
 endif
 ifneq ($(PTXCONF_ROOTFS_MEDIA2),"")
-	@$(call install_copy, 0, 0, 0777, /media/$(PTXCONF_ROOTFS_MEDIA2))
+	@$(call install_copy, rootfs, 0, 0, 0777, /media/$(PTXCONF_ROOTFS_MEDIA2))
 endif
 ifneq ($(PTXCONF_ROOTFS_MEDIA3),"")
-	@$(call install_copy, 0, 0, 0777, /media/$(PTXCONF_ROOTFS_MEDIA3))
+	@$(call install_copy, rootfs, 0, 0, 0777, /media/$(PTXCONF_ROOTFS_MEDIA3))
 endif
 ifneq ($(PTXCONF_ROOTFS_MEDIA4),"")
-	@$(call install_copy, 0, 0, 0777, /media/$(PTXCONF_ROOTFS_MEDIA4))
+	@$(call install_copy, rootfs, 0, 0, 0777, /media/$(PTXCONF_ROOTFS_MEDIA4))
 endif
 ifneq ($(PTXCONF_ROOTFS_MEDIA5),"")
-	@$(call install_copy, 0, 0, 0777, /media/$(PTXCONF_ROOTFS_MEDIA5))
+	@$(call install_copy, rootfs, 0, 0, 0777, /media/$(PTXCONF_ROOTFS_MEDIA5))
 endif
 ifneq ($(PTXCONF_ROOTFS_MEDIA6),"")
-	@$(call install_copy, 0, 0, 0777, /media/$(PTXCONF_ROOTFS_MEDIA6))
+	@$(call install_copy, rootfs, 0, 0, 0777, /media/$(PTXCONF_ROOTFS_MEDIA6))
 endif
 ifneq ($(PTXCONF_ROOTFS_MEDIA7),"")
-	@$(call install_copy, 0, 0, 0777, /media/$(PTXCONF_ROOTFS_MEDIA7))
+	@$(call install_copy, rootfs, 0, 0, 0777, /media/$(PTXCONF_ROOTFS_MEDIA7))
 endif
 ifneq ($(PTXCONF_ROOTFS_MEDIA8),"")
-	@$(call install_copy, 0, 0, 0777, /media/$(PTXCONF_ROOTFS_MEDIA8))
+	@$(call install_copy, rootfs, 0, 0, 0777, /media/$(PTXCONF_ROOTFS_MEDIA8))
 endif
 ifneq ($(PTXCONF_ROOTFS_MEDIA9),"")
-	@$(call install_copy, 0, 0, 0777, /media/$(PTXCONF_ROOTFS_MEDIA9))
+	@$(call install_copy, rootfs, 0, 0, 0777, /media/$(PTXCONF_ROOTFS_MEDIA9))
 endif
 ifneq ($(PTXCONF_ROOTFS_MEDIA10),"")
-	@$(call install_copy, 0, 0, 0777, /media/$(PTXCONF_ROOTFS_MEDIA10))
+	@$(call install_copy, rootfs, 0, 0, 0777, /media/$(PTXCONF_ROOTFS_MEDIA10))
 endif
 endif
 ifdef PTXCONF_ROOTFS_MNT
-	@$(call install_copy, 0, 0, 0755, /mnt)
+	@$(call install_copy, rootfs, 0, 0, 0755, /mnt)
 endif
 ifdef PTXCONF_ROOTFS_PROC
-	@$(call install_copy, 0, 0, 0555, /proc)
+	@$(call install_copy, rootfs, 0, 0, 0555, /proc)
 endif
 ifdef PTXCONF_ROOTFS_SYS
-	@$(call install_copy, 0, 0, 0755, /sys)
+	@$(call install_copy, rootfs, 0, 0, 0755, /sys)
 endif
 ifdef PTXCONF_ROOTFS_TMP
-	@$(call install_copy, 0, 0, 1777, /tmp)
+	@$(call install_copy, rootfs, 0, 0, 1777, /tmp)
 endif
 ifdef PTXCONF_ROOTFS_VAR
-	@$(call install_copy, 0, 0, 0755, /var)
+	@$(call install_copy, rootfs, 0, 0, 0755, /var)
 endif
 ifdef PTXCONF_ROOTFS_VAR_LOG
-	@$(call install_copy, 0, 0, 0755, /var/log)
+	@$(call install_copy, rootfs, 0, 0, 0755, /var/log)
 endif
 ifdef PTXCONF_ROOTFS_VAR_RUN
-	@$(call install_copy, 0, 0, 0755, /var/run)
+	@$(call install_copy, rootfs, 0, 0, 0755, /var/run)
 endif
 ifdef PTXCONF_ROOTFS_VAR_LOCK
-	@$(call install_copy, 0, 0, 0755, /var/lock)
+	@$(call install_copy, rootfs, 0, 0, 0755, /var/lock)
 endif
 
 	#
@@ -161,19 +161,19 @@ endif
 	#
 
 ifdef PTXCONF_ROOTFS_GENERIC_FSTAB
-	@$(call install_copy, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/fstab, /etc/fstab, n)
+	@$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/fstab, /etc/fstab, n)
 endif
 
 ifdef PTXCONF_ROOTFS_GENERIC_MTAB
-	@$(call install_link, /proc/mounts, /etc/mtab)
+	@$(call install_link, rootfs, /proc/mounts, /etc/mtab)
 endif
 
 ifdef PTXCONF_ROOTFS_GENERIC_GROUP
-	@$(call install_copy, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/group,        /etc/group, n)
-	@$(call install_copy, 0, 0, 0640, $(PTXDIST_TOPDIR)/projects/generic/etc/gshadow,      /etc/gshadow, n)
+	@$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/group,        /etc/group, n)
+	@$(call install_copy, rootfs, 0, 0, 0640, $(PTXDIST_TOPDIR)/projects/generic/etc/gshadow,      /etc/gshadow, n)
 endif
 ifdef PTXCONF_ROOTFS_GENERIC_HOSTNAME
-	@$(call install_copy, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/hostname,     /etc/hostname, n)
+	@$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/hostname,     /etc/hostname, n)
 
 	x="$(call remove_quotes,$(PTXCONF_ROOTFS_ETC_HOSTNAME))"; \
 	if [ -n "$$x" ]; then \
@@ -183,10 +183,10 @@ ifdef PTXCONF_ROOTFS_GENERIC_HOSTNAME
 	fi
 endif
 ifdef PTXCONF_ROOTFS_GENERIC_HOSTS
-	@$(call install_copy, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/hosts,        /etc/hosts, n)
+	@$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/hosts,        /etc/hosts, n)
 endif
 ifdef PTXCONF_ROOTFS_GENERIC_INITTAB
-	@$(call install_copy, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/inittab,      /etc/inittab, n)
+	@$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/inittab,      /etc/inittab, n)
 
 	x="$(call remove_quotes,$(PTXCONF_ROOTFS_ETC_CONSOLE))"; \
 	if [ -n "$$x" ]; then \
@@ -203,7 +203,7 @@ ifdef PTXCONF_ROOTFS_GENERIC_INITTAB
 	fi
 endif
 ifdef PTXCONF_ROOTFS_GENERIC_IPKG_CONF
-	@$(call install_copy, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/ipkg.conf, /etc/ipkg.conf, n)
+	@$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/ipkg.conf, /etc/ipkg.conf, n)
 	x="$(call remove_quotes,$(PTXCONF_ROOTFS_GENERIC_IPKG_CONF_URL))"; \
 	echo $$x; \
 	perl -i -p -e "s,\@SRC@,src $$x,g" $(ROOTDIR)/etc/ipkg.conf; \
@@ -214,13 +214,13 @@ ifdef PTXCONF_ROOTFS_GENERIC_IPKG_CONF
 	perl -i -p -e "s,\@ARCH@,$$x,g" $(IMAGEDIR)/ipkg/etc/ipkg.conf;
 endif
 ifdef PTXCONF_ROOTFS_GENERIC_NSSWITCH
-	@$(call install_copy, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/nsswitch.conf,/etc/nsswitch.conf, n)
+	@$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/nsswitch.conf,/etc/nsswitch.conf, n)
 endif
 ifdef PTXCONF_ROOTFS_GENERIC_PASSWD
-	@$(call install_copy, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/passwd,       /etc/passwd, n)
+	@$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/passwd,       /etc/passwd, n)
 endif
 ifdef PTXCONF_ROOTFS_GENERIC_PROFILE
-	@$(call install_copy, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/profile,      /etc/profile, n)
+	@$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/profile,      /etc/profile, n)
 	
 	x="$(call remove_quotes,$(PTXCONF_ROOTFS_ETC_PS1))"; \
 	echo $$x; \
@@ -238,10 +238,10 @@ ifdef PTXCONF_ROOTFS_GENERIC_PROFILE
 	perl -i -p -e "s,\@PS4@,\"$$x\",g" $(IMAGEDIR)/ipkg/etc/profile;
 endif
 ifdef PTXCONF_ROOTFS_GENERIC_PROTOCOLS
-	@$(call install_copy, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/protocols,    /etc/protocols, n)
+	@$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/protocols,    /etc/protocols, n)
 endif
 ifdef PTXCONF_ROOTFS_GENERIC_RESOLV
-	@$(call install_copy, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/resolv.conf,  /etc/resolv.conf, n)
+	@$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/resolv.conf,  /etc/resolv.conf, n)
 endif
 ifdef PTXCONF_ROOTFS_GENERIC_INETD
 	inetdconf=`mktemp`; \
@@ -264,80 +264,80 @@ ifdef PTXCONF_ROOTFS_GENERIC_INETD
 	cat $$inetdconf; \
 	echo "services:"; \
 	cat $$servicesfile; \
-	$(call install_copy, 0, 0, 0644, $$inetdconf, /etc/inetd.conf, n); \
-	$(call install_copy, 0, 0, 0644, $$servicesfile, /etc/services, n); \
+	$(call install_copy, rootfs, 0, 0, 0644, $$inetdconf, /etc/inetd.conf, n); \
+	$(call install_copy, rootfs, 0, 0, 0644, $$servicesfile, /etc/services, n); \
 	rm -f $$inetdconf; \
 	rm -f $$servicesfile
 endif
 ifdef PTXCONF_ROOTFS_GENERIC_SHADOW
-	@$(call install_copy, 0, 0, 0640, $(PTXDIST_TOPDIR)/projects/generic/etc/shadow,       /etc/shadow, n)
-	@$(call install_copy, 0, 0, 0600, $(PTXDIST_TOPDIR)/projects/generic/etc/shadow-,      /etc/shadow-, n)
+	@$(call install_copy, rootfs, 0, 0, 0640, $(PTXDIST_TOPDIR)/projects/generic/etc/shadow,       /etc/shadow, n)
+	@$(call install_copy, rootfs, 0, 0, 0600, $(PTXDIST_TOPDIR)/projects/generic/etc/shadow-,      /etc/shadow-, n)
 endif
 ifdef PTXCONF_ROOTFS_GENERIC_UDHCPC
-	@$(call install_copy, 0, 0, 0744, $(PTXDIST_TOPDIR)/projects/generic/etc/udhcpc.script,/etc/udhcpc.script, n)
+	@$(call install_copy, rootfs, 0, 0, 0744, $(PTXDIST_TOPDIR)/projects/generic/etc/udhcpc.script,/etc/udhcpc.script, n)
 endif
 
 	#
 	# Startup scripts in /etc/init.d
 	#
 ifdef PTXCONF_ROOTFS_ETC_INITD_INETD
-	@$(call install_copy, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/inetd, /etc/init.d/inetd, n)
+	@$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/inetd, /etc/init.d/inetd, n)
 ifneq ($(PTXCONF_ROOTFS_ETC_INITD_INETD_LINK),"")
-	@$(call install_link, /etc/init.d/inetd, /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_INETD_LINK))
+	@$(call install_link, rootfs, /etc/init.d/inetd, /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_INETD_LINK))
 endif
 endif
 
 ifdef PTXCONF_ROOTFS_ETC_INITD
 
 	# Copy generic etc/init.d
-	@$(call install_copy, 0, 0, 0755, /etc/init.d)
-	@$(call install_copy, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/rcS,        /etc/init.d/rcS, n)
+	@$(call install_copy, rootfs, 0, 0, 0755, /etc/init.d)
+	@$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/rcS,        /etc/init.d/rcS, n)
 
 ifdef ROOTFS_ETC_INITD_LOGROTATE
-	@$(call install_copy, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/logrotate, /etc/init.d/logrotate, n)
+	@$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/logrotate, /etc/init.d/logrotate, n)
 endif
 
 ifdef PTXCONF_ROOTFS_ETC_INITD_NETWORKING
-	@$(call install_copy, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/networking, /etc/init.d/networking, n)
-	@$(call install_copy, 0, 0, 0755, /etc/network/if-down.d)
-	@$(call install_copy, 0, 0, 0755, /etc/network/if-up.d)
-	@$(call install_copy, 0, 0, 0755, /etc/network/if-post-down.d)
-	@$(call install_copy, 0, 0, 0755, /etc/network/if-pre-up.d)
+	@$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/networking, /etc/init.d/networking, n)
+	@$(call install_copy, rootfs, 0, 0, 0755, /etc/network/if-down.d)
+	@$(call install_copy, rootfs, 0, 0, 0755, /etc/network/if-up.d)
+	@$(call install_copy, rootfs, 0, 0, 0755, /etc/network/if-post-down.d)
+	@$(call install_copy, rootfs, 0, 0, 0755, /etc/network/if-pre-up.d)
 ifneq ($(PTXCONF_ROOTFS_ETC_INITD_NETWORKING_LINK),"")
-	@$(call install_link, /etc/init.d/networking, /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_NETWORKING_LINK))
+	@$(call install_link, rootfs, /etc/init.d/networking, /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_NETWORKING_LINK))
 endif
 ifneq ($(PTXCONF_ROOTFS_ETC_INITD_NETWORKING_INTERFACES),"")
-	$(call install_copy, 0, 0, 0644, $(PTXCONF_ROOTFS_ETC_INITD_NETWORKING_INTERFACES), /etc/network/interfaces, n)
+	$(call install_copy, rootfs, 0, 0, 0644, $(PTXCONF_ROOTFS_ETC_INITD_NETWORKING_INTERFACES), /etc/network/interfaces, n)
 endif
 endif
 
 ifdef PTXCONF_ROOTFS_ETC_INITD_TELNETD
-	@$(call install_copy, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/telnetd,    /etc/init.d/telnetd, n)
+	@$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/telnetd,    /etc/init.d/telnetd, n)
 ifneq ($(PTXCONF_ROOTFS_ETC_INITD_TELNETD_LINK),"")
-	@$(call install_link, /etc/init.d/telnetd, /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_TELNETD_LINK))
+	@$(call install_link, rootfs, /etc/init.d/telnetd, /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_TELNETD_LINK))
 endif
 endif
 
 ifdef PTXCONF_ROOTFS_ETC_INITD_HTTPD
-	@$(call install_copy, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/httpd,    /etc/init.d/httpd, n)
+	@$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/httpd,    /etc/init.d/httpd, n)
 	x="$(call remove_quotes,$(PTXCONF_APACHE2_CONFIGDIR))/httpd.conf"; \
 	echo $$x; \
 	perl -i -p -e "s,\@APACHECONFIG@,$$x,g" $(ROOTDIR)/etc/init.d/httpd; \
 	perl -i -p -e "s,\@APACHECONFIG@,$$x,g" $(IMAGEDIR)/ipkg/etc/init.d/httpd;
 
 ifneq ($(PTXCONF_ROOTFS_ETC_INITD_HTTPD_LINK),"")
-	@$(call install_link, /etc/init.d/httpd, /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_HTTPD_LINK))
+	@$(call install_link, rootfs, /etc/init.d/httpd, /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_HTTPD_LINK))
 endif
 endif
 
 ifdef PTXCONF_ROOTFS_ETC_INITD_STARTUP
-	@$(call install_copy, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/startup,    /etc/init.d/startup, n)
+	@$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/startup,    /etc/init.d/startup, n)
 endif
 
-	@$(call install_copy, 0, 0, 0755, /etc/rc.d)
+	@$(call install_copy, rootfs, 0, 0, 0755, /etc/rc.d)
 
 ifdef PTXCONF_ROOTFS_ETC_INITD_BANNER
-	@$(call install_copy, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/banner,     /etc/init.d/banner, n)
+	@$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/banner,     /etc/init.d/banner, n)
 	x="$(call remove_quotes,$(PTXCONF_ROOTFS_ETC_VENDOR))"; \
 	perl -i -p -e "s,\@VENDOR@,$$x,g" $(ROOTDIR)/etc/init.d/banner; \
 	perl -i -p -e "s,\@VENDOR@,$$x,g" $(IMAGEDIR)/ipkg/etc/init.d/banner; \
@@ -355,13 +355,13 @@ ifdef PTXCONF_ROOTFS_ETC_INITD_BANNER
 	perl -i -p -e "s,\@DATE@,$(shell date -Iseconds),g" $(ROOTDIR)/etc/init.d/banner
 	perl -i -p -e "s,\@DATE@,$(shell date -Iseconds),g" $(IMAGEDIR)/ipkg/etc/init.d/banner
 ifneq ($(PTXCONF_ROOTFS_ETC_INITD_BANNER_LINK),"")
-	@$(call install_link, ../init.d/banner, /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_BANNER_LINK))
+	@$(call install_link, rootfs, ../init.d/banner, /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_BANNER_LINK))
 endif
 endif
 
 endif
 
-	@$(call install_finish)
+	@$(call install_finish, rootfs)
 
 	@$(call touch, $@)
 
diff --git a/rules/rsync.make b/rules/rsync.make
index 855abda92..a6c2e6174 100644
--- a/rules/rsync.make
+++ b/rules/rsync.make
@@ -108,18 +108,18 @@ rsync_targetinstall: $(STATEDIR)/rsync.targetinstall
 $(STATEDIR)/rsync.targetinstall: $(rsync_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,rsync)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(RSYNC_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, rsync)
+	@$(call install_fixup, rsync,PACKAGE,rsync)
+	@$(call install_fixup, rsync,PRIORITY,optional)
+	@$(call install_fixup, rsync,VERSION,$(RSYNC_VERSION))
+	@$(call install_fixup, rsync,SECTION,base)
+	@$(call install_fixup, rsync,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, rsync,DEPENDS,)
+	@$(call install_fixup, rsync,DESCRIPTION,missing)
 	
-	@$(call install_copy, 0, 0, 0755, $(RSYNC_DIR)/rsync, /usr/bin/rsync)
+	@$(call install_copy, rsync, 0, 0, 0755, $(RSYNC_DIR)/rsync, /usr/bin/rsync)
 	
-	@$(call install_finish)
+	@$(call install_finish, rsync)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/sdl.make b/rules/sdl.make
index b2de91069..6a3af573e 100644
--- a/rules/sdl.make
+++ b/rules/sdl.make
@@ -168,18 +168,18 @@ sdl_targetinstall: $(STATEDIR)/sdl.targetinstall
 $(STATEDIR)/sdl.targetinstall: $(sdl_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,sdl)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(SDL_LIB_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, sdl)
+	@$(call install_fixup, sdl,PACKAGE,sdl)
+	@$(call install_fixup, sdl,PRIORITY,optional)
+	@$(call install_fixup, sdl,VERSION,$(SDL_LIB_VERSION))
+	@$(call install_fixup, sdl,SECTION,base)
+	@$(call install_fixup, sdl,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, sdl,DEPENDS,)
+	@$(call install_fixup, sdl,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, sdl)
 
 	@$(call touch, $@)
 
diff --git a/rules/sdl_image.make b/rules/sdl_image.make
index 4e459fbab..ccce99b0c 100644
--- a/rules/sdl_image.make
+++ b/rules/sdl_image.make
@@ -120,18 +120,18 @@ sdl_image_targetinstall: $(STATEDIR)/sdl_image.targetinstall
 $(STATEDIR)/sdl_image.targetinstall: $(sdl_image_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,sdl_image)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(SDL_IMAGE_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(SDL_IMAGE_DIR)/foobar, /dev/null)
-
-	@$(call install_finish)
+	@$(call install_init, sdl_image)
+	@$(call install_fixup, sdl_image,PACKAGE,sdl_image)
+	@$(call install_fixup, sdl_image,PRIORITY,optional)
+	@$(call install_fixup, sdl_image,VERSION,$(SDL_IMAGE_VERSION))
+	@$(call install_fixup, sdl_image,SECTION,base)
+	@$(call install_fixup, sdl_image,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, sdl_image,DEPENDS,)
+	@$(call install_fixup, sdl_image,DESCRIPTION,missing)
+
+	@$(call install_copy, sdl_image, 0, 0, 0755, $(SDL_IMAGE_DIR)/foobar, /dev/null)
+
+	@$(call install_finish, sdl_image)
 
 	@$(call touch, $@)
 
diff --git a/rules/setmixer.make b/rules/setmixer.make
index 095753edc..e0bcd51c8 100644
--- a/rules/setmixer.make
+++ b/rules/setmixer.make
@@ -99,18 +99,18 @@ setmixer_targetinstall: $(STATEDIR)/setmixer.targetinstall
 $(STATEDIR)/setmixer.targetinstall: $(setmixer_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,setmixer)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(SETMIXER_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, setmixer)
+	@$(call install_fixup, setmixer,PACKAGE,setmixer)
+	@$(call install_fixup, setmixer,PRIORITY,optional)
+	@$(call install_fixup, setmixer,VERSION,$(SETMIXER_VERSION))
+	@$(call install_fixup, setmixer,SECTION,base)
+	@$(call install_fixup, setmixer,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, setmixer,DEPENDS,)
+	@$(call install_fixup, setmixer,DESCRIPTION,missing)
 	
-	@$(call install_copy, 0, 0, 0755, $(SETMIXER_DIR)/setmixer, /usr/bin/setmixer)
+	@$(call install_copy, setmixer, 0, 0, 0755, $(SETMIXER_DIR)/setmixer, /usr/bin/setmixer)
 
-	@$(call install_finish)
+	@$(call install_finish, setmixer)
 
 	@$(call touch, $@)
 
diff --git a/rules/setserial.make b/rules/setserial.make
index bced7016c..48f0539d2 100644
--- a/rules/setserial.make
+++ b/rules/setserial.make
@@ -106,18 +106,18 @@ setserial_targetinstall: $(STATEDIR)/setserial.targetinstall
 $(STATEDIR)/setserial.targetinstall: $(setserial_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,setserial)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(SETSERIAL_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Benedikt Spranger <b.spranger\@linutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(SETSERIAL_DIR)/setserial, /bin/setserial)
-
-	@$(call install_finish)
+	@$(call install_init, setserial)
+	@$(call install_fixup, setserial,PACKAGE,setserial)
+	@$(call install_fixup, setserial,PRIORITY,optional)
+	@$(call install_fixup, setserial,VERSION,$(SETSERIAL_VERSION))
+	@$(call install_fixup, setserial,SECTION,base)
+	@$(call install_fixup, setserial,AUTHOR,"Benedikt Spranger <b.spranger\@linutronix.de>")
+	@$(call install_fixup, setserial,DEPENDS,)
+	@$(call install_fixup, setserial,DESCRIPTION,missing)
+
+	@$(call install_copy, setserial, 0, 0, 0755, $(SETSERIAL_DIR)/setserial, /bin/setserial)
+
+	@$(call install_finish, setserial)
 
 	@$(call touch, $@)
 
diff --git a/rules/shorewall.make b/rules/shorewall.make
index e486af2d8..14a1d0b31 100644
--- a/rules/shorewall.make
+++ b/rules/shorewall.make
@@ -97,21 +97,21 @@ shorewall_targetinstall: $(STATEDIR)/shorewall.targetinstall
 $(STATEDIR)/shorewall.targetinstall: $(shorewall_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,shorewall)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(SHOREWALL_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, shorewall)
+	@$(call install_fixup, shorewall,PACKAGE,shorewall)
+	@$(call install_fixup, shorewall,PRIORITY,optional)
+	@$(call install_fixup, shorewall,VERSION,$(SHOREWALL_VERSION))
+	@$(call install_fixup, shorewall,SECTION,base)
+	@$(call install_fixup, shorewall,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, shorewall,DEPENDS,)
+	@$(call install_fixup, shorewall,DESCRIPTION,missing)
 	
-	@$(call install_copy, 0, 0, 0755, /etc/shorewall)
+	@$(call install_copy, shorewall, 0, 0, 0755, /etc/shorewall)
 	# FIXME: do this right
 	PREFIX=$(ROOTDIR) $(FAKEROOT) $(SHOREWALL_DIR)/install.sh
 	PREFIX=$(IMAGEDIR)/ipkg $(FAKEROOT) $(SHOREWALL_DIR)/install.sh
 
-	@$(call install_finish)
+	@$(call install_finish, shorewall)
 
 	@$(call touch, $@)
 
diff --git a/rules/slang.make b/rules/slang.make
index 937ab5ba9..b2038bfd3 100644
--- a/rules/slang.make
+++ b/rules/slang.make
@@ -106,22 +106,22 @@ slang_targetinstall: $(STATEDIR)/slang.targetinstall
 $(STATEDIR)/slang.targetinstall: $(slang_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,slang)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(SLANG_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, slang)
+	@$(call install_fixup, slang,PACKAGE,slang)
+	@$(call install_fixup, slang,PRIORITY,optional)
+	@$(call install_fixup, slang,VERSION,$(SLANG_VERSION))
+	@$(call install_fixup, slang,SECTION,base)
+	@$(call install_fixup, slang,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, slang,DEPENDS,)
+	@$(call install_fixup, slang,DESCRIPTION,missing)
 	
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, slang, 0, 0, 0644, \
 		$(SLANG_DIR)/src/elfobjs/libslang.so.$(SLANG_VERSION), \
 		/usr/lib/libslang.so.$(SLANG_VERSION))
-	@$(call install_link, libslang.so.$(SLANG_VERSION), /usr/lib/libslang.so.1)
-	@$(call install_link, libslang.so.$(SLANG_VERSION), /usr/lib/libslang.so)
+	@$(call install_link, slang, libslang.so.$(SLANG_VERSION), /usr/lib/libslang.so.1)
+	@$(call install_link, slang, libslang.so.$(SLANG_VERSION), /usr/lib/libslang.so)
 
-	@$(call install_finish)
+	@$(call install_finish, slang)
 
 	@$(call touch, $@)
 
diff --git a/rules/smtpclient.make b/rules/smtpclient.make
index dc1d90b28..f9a82c7d6 100644
--- a/rules/smtpclient.make
+++ b/rules/smtpclient.make
@@ -106,18 +106,18 @@ smtpclient_targetinstall: $(STATEDIR)/smtpclient.targetinstall
 $(STATEDIR)/smtpclient.targetinstall: $(smtpclient_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 	
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,smtpclient)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(SMTPCLIENT_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(SMTPCLIENT_DIR)/smtpclient, /usr/bin/smtpclient)
-
-	@$(call install_finish)
+	@$(call install_init, smtpclient)
+	@$(call install_fixup, smtpclient,PACKAGE,smtpclient)
+	@$(call install_fixup, smtpclient,PRIORITY,optional)
+	@$(call install_fixup, smtpclient,VERSION,$(SMTPCLIENT_VERSION))
+	@$(call install_fixup, smtpclient,SECTION,base)
+	@$(call install_fixup, smtpclient,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, smtpclient,DEPENDS,)
+	@$(call install_fixup, smtpclient,DESCRIPTION,missing)
+
+	@$(call install_copy, smtpclient, 0, 0, 0755, $(SMTPCLIENT_DIR)/smtpclient, /usr/bin/smtpclient)
+
+	@$(call install_finish, smtpclient)
 
 	@$(call touch, $@)
 
diff --git a/rules/sqlite.make b/rules/sqlite.make
index 64d363c9b..a02427db5 100644
--- a/rules/sqlite.make
+++ b/rules/sqlite.make
@@ -143,18 +143,18 @@ $(STATEDIR)/sqlite.targetinstall: $(sqlite_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 	install -d $(ROOTDIR)/usr/lib
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,sqlite)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(SQLITE_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Ladislav Michl <ladis\@linux-mips.org>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, $(SQLITE_DIR)/libsqlite3.so, /usr/lib/libsqlite3.so)
-
-	@$(call install_finish)
+	@$(call install_init, sqlite)
+	@$(call install_fixup, sqlite,PACKAGE,sqlite)
+	@$(call install_fixup, sqlite,PRIORITY,optional)
+	@$(call install_fixup, sqlite,VERSION,$(SQLITE_VERSION))
+	@$(call install_fixup, sqlite,SECTION,base)
+	@$(call install_fixup, sqlite,AUTHOR,"Ladislav Michl <ladis\@linux-mips.org>")
+	@$(call install_fixup, sqlite,DEPENDS,)
+	@$(call install_fixup, sqlite,DESCRIPTION,missing)
+
+	@$(call install_copy, sqlite, 0, 0, 0644, $(SQLITE_DIR)/libsqlite3.so, /usr/lib/libsqlite3.so)
+
+	@$(call install_finish, sqlite)
 
 	@$(call touch, $@)
 
diff --git a/rules/ssmtp.make b/rules/ssmtp.make
index 85643035c..124f3abd1 100644
--- a/rules/ssmtp.make
+++ b/rules/ssmtp.make
@@ -135,18 +135,18 @@ ssmtp_targetinstall: $(STATEDIR)/ssmtp.targetinstall
 $(STATEDIR)/ssmtp.targetinstall: $(ssmtp_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,ssmtp)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(SSMTP_VERSION)-$(SSMTP_PATCH))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(SSMTP_DIR)/ssmtp, /sbin/ssmtp)
-
-	@$(call install_finish)
+	@$(call install_init, ssmtp)
+	@$(call install_fixup, ssmtp,PACKAGE,ssmtp)
+	@$(call install_fixup, ssmtp,PRIORITY,optional)
+	@$(call install_fixup, ssmtp,VERSION,$(SSMTP_VERSION)-$(SSMTP_PATCH))
+	@$(call install_fixup, ssmtp,SECTION,base)
+	@$(call install_fixup, ssmtp,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, ssmtp,DEPENDS,)
+	@$(call install_fixup, ssmtp,DESCRIPTION,missing)
+
+	@$(call install_copy, ssmtp, 0, 0, 0755, $(SSMTP_DIR)/ssmtp, /sbin/ssmtp)
+
+	@$(call install_finish, ssmtp)
 
 	@$(call touch, $@)
 
diff --git a/rules/strace.make b/rules/strace.make
index c1bd41d95..4900a9d82 100644
--- a/rules/strace.make
+++ b/rules/strace.make
@@ -107,18 +107,18 @@ strace_targetinstall: $(STATEDIR)/strace.targetinstall
 $(STATEDIR)/strace.targetinstall: $(strace_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,strace)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(STRACE_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(STRACE_DIR)/strace, /usr/bin/strace)
-
-	@$(call install_finish)
+	@$(call install_init, strace)
+	@$(call install_fixup, strace,PACKAGE,strace)
+	@$(call install_fixup, strace,PRIORITY,optional)
+	@$(call install_fixup, strace,VERSION,$(STRACE_VERSION))
+	@$(call install_fixup, strace,SECTION,base)
+	@$(call install_fixup, strace,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, strace,DEPENDS,)
+	@$(call install_fixup, strace,DESCRIPTION,missing)
+
+	@$(call install_copy, strace, 0, 0, 0755, $(STRACE_DIR)/strace, /usr/bin/strace)
+
+	@$(call install_finish, strace)
 
 	@$(call touch, $@)
 
diff --git a/rules/sysfsutils.make b/rules/sysfsutils.make
index 1e930a185..365e1998c 100644
--- a/rules/sysfsutils.make
+++ b/rules/sysfsutils.make
@@ -106,24 +106,24 @@ sysfsutils_targetinstall: $(STATEDIR)/sysfsutils.targetinstall
 $(STATEDIR)/sysfsutils.targetinstall: $(sysfsutils_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,sysfsutils)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(SYSFSUTILS_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, sysfsutils)
+	@$(call install_fixup, sysfsutils,PACKAGE,sysfsutils)
+	@$(call install_fixup, sysfsutils,PRIORITY,optional)
+	@$(call install_fixup, sysfsutils,VERSION,$(SYSFSUTILS_VERSION))
+	@$(call install_fixup, sysfsutils,SECTION,base)
+	@$(call install_fixup, sysfsutils,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, sysfsutils,DEPENDS,)
+	@$(call install_fixup, sysfsutils,DESCRIPTION,missing)
 	
 ifdef PTXCONF_SYSFSUTILS_LIB
-	@$(call install_copy, 0, 0, 0644, $(SYSFSUTILS_DIR)/lib/.libs/libsysfs.so.1.0.3, /lib/libsysfs.so.1.0.3)
-	@$(call install_link, libsysfs.so.1.0.3, /lib/libsysfs.so.1)
-	@$(call install_link, libsysfs.so.1.0.3, /lib/libsysfs.so)
+	@$(call install_copy, sysfsutils, 0, 0, 0644, $(SYSFSUTILS_DIR)/lib/.libs/libsysfs.so.1.0.3, /lib/libsysfs.so.1.0.3)
+	@$(call install_link, sysfsutils, libsysfs.so.1.0.3, /lib/libsysfs.so.1)
+	@$(call install_link, sysfsutils, libsysfs.so.1.0.3, /lib/libsysfs.so)
 endif
 ifdef PTXCONF_SYSFSUTILS_SYSTOOL
-	@$(call install_copy, 0, 0, 0775, $(SYSFSUTILS_DIR)/cmd/systool, /bin/systool, n)
+	@$(call install_copy, sysfsutils, 0, 0, 0775, $(SYSFSUTILS_DIR)/cmd/systool, /bin/systool, n)
 endif
-	@$(call install_finish)
+	@$(call install_finish, sysfsutils)
 
 	@$(call touch, $@)
 
diff --git a/rules/syslogng.make b/rules/syslogng.make
index 80a3b186f..b60b18dbc 100644
--- a/rules/syslogng.make
+++ b/rules/syslogng.make
@@ -126,18 +126,18 @@ syslogng_targetinstall: $(STATEDIR)/syslogng.targetinstall
 $(STATEDIR)/syslogng.targetinstall: $(syslogng_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,syslogng)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(SYSLOGNG_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(SYSLOGNG_DIR)/src/syslog-ng, /sbin/syslog-ng)
-
-	@$(call install_finish)
+	@$(call install_init, syslogng)
+	@$(call install_fixup, syslogng,PACKAGE,syslogng)
+	@$(call install_fixup, syslogng,PRIORITY,optional)
+	@$(call install_fixup, syslogng,VERSION,$(SYSLOGNG_VERSION))
+	@$(call install_fixup, syslogng,SECTION,base)
+	@$(call install_fixup, syslogng,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, syslogng,DEPENDS,)
+	@$(call install_fixup, syslogng,DESCRIPTION,missing)
+
+	@$(call install_copy, syslogng, 0, 0, 0755, $(SYSLOGNG_DIR)/src/syslog-ng, /sbin/syslog-ng)
+
+	@$(call install_finish, syslogng)
 
 	@$(call touch, $@)
 
diff --git a/rules/sysutils.make b/rules/sysutils.make
index daa96732c..fe74c23e4 100644
--- a/rules/sysutils.make
+++ b/rules/sysutils.make
@@ -96,22 +96,22 @@ sysutils_targetinstall: $(STATEDIR)/sysutils.targetinstall
 $(STATEDIR)/sysutils.targetinstall: $(sysutils_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,sysutils)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(SYSUTILS_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, sysutils)
+	@$(call install_fixup, sysutils,PACKAGE,sysutils)
+	@$(call install_fixup, sysutils,PRIORITY,optional)
+	@$(call install_fixup, sysutils,VERSION,$(SYSUTILS_VERSION))
+	@$(call install_fixup, sysutils,SECTION,base)
+	@$(call install_fixup, sysutils,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, sysutils,DEPENDS,)
+	@$(call install_fixup, sysutils,DESCRIPTION,missing)
 
 ifdef PTXCONF_SYSUTILS_LSBUS
-	@$(call install_copy, 0, 0, 0755, $(SYSUTILS_DIR)/cmd/lsbus, /usr/sbin/lsbus)
+	@$(call install_copy, sysutils, 0, 0, 0755, $(SYSUTILS_DIR)/cmd/lsbus, /usr/sbin/lsbus)
 endif
 ifdef PTXCONF_SYSUTILS_SYSTOOL
-	@$(call install_copy, 0, 0, 0755, $(SYSUTILS_DIR)/cmd/systool, /usr/sbin/systool)
+	@$(call install_copy, sysutils, 0, 0, 0755, $(SYSUTILS_DIR)/cmd/systool, /usr/sbin/systool)
 endif
-	@$(call install_finish)
+	@$(call install_finish, sysutils)
 
 	@$(call touch, $@)
 
diff --git a/rules/sysvinit.make b/rules/sysvinit.make
index 1bffda0e5..6801f8994 100644
--- a/rules/sysvinit.make
+++ b/rules/sysvinit.make
@@ -112,67 +112,67 @@ sysvinit_targetinstall: $(STATEDIR)/sysvinit.targetinstall
 $(STATEDIR)/sysvinit.targetinstall: $(sysvinit_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,sysvinit)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(SYSVINIT_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Oscar Peredo <oscar\@exis.cl>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, sysvinit)
+	@$(call install_fixup, sysvinit,PACKAGE,sysvinit)
+	@$(call install_fixup, sysvinit,PRIORITY,optional)
+	@$(call install_fixup, sysvinit,VERSION,$(SYSVINIT_VERSION))
+	@$(call install_fixup, sysvinit,SECTION,base)
+	@$(call install_fixup, sysvinit,AUTHOR,"Oscar Peredo <oscar\@exis.cl>")
+	@$(call install_fixup, sysvinit,DEPENDS,)
+	@$(call install_fixup, sysvinit,DESCRIPTION,missing)
 
 ifdef PTXCONF_SYSVINIT_INIT
-	@$(call install_copy, 0, 0, 0755, $(SYSVINIT_DIR)/src/init, /sbin/init)
-	@$(call install_link, init, /sbin/telinit)
+	@$(call install_copy, sysvinit, 0, 0, 0755, $(SYSVINIT_DIR)/src/init, /sbin/init)
+	@$(call install_link, sysvinit, init, /sbin/telinit)
 endif
 ifdef PTXCONF_SYSVINIT_HALT
-	@$(call install_copy, 0, 0, 0755, $(SYSVINIT_DIR)/src/halt, /sbin/halt)
-	@$(call install_link, halt, /sbin/poweroff)
-	@$(call install_link, halt, /sbin/reboot)
+	@$(call install_copy, sysvinit, 0, 0, 0755, $(SYSVINIT_DIR)/src/halt, /sbin/halt)
+	@$(call install_link, sysvinit, halt, /sbin/poweroff)
+	@$(call install_link, sysvinit, halt, /sbin/reboot)
 endif
 ifdef PTXCONF_SYSVINIT_SHUTDOWN
-	@$(call install_copy, 0, 0, 0755, $(SYSVINIT_DIR)/src/shutdown, /sbin/shutdown)
+	@$(call install_copy, sysvinit, 0, 0, 0755, $(SYSVINIT_DIR)/src/shutdown, /sbin/shutdown)
 endif
 ifdef PTXCONF_SYSVINIT_RUNLEVEL
-	@$(call install_copy, 0, 0, 0755, $(SYSVINIT_DIR)/src/runlevel, /sbin/runlevel)
+	@$(call install_copy, sysvinit, 0, 0, 0755, $(SYSVINIT_DIR)/src/runlevel, /sbin/runlevel)
 endif
 ifdef PTXCONF_SYSVINIT_KILLALL5
-	@$(call install_copy, 0, 0, 0755, $(SYSVINIT_DIR)/src/killall5, /sbin/killall5)
+	@$(call install_copy, sysvinit, 0, 0, 0755, $(SYSVINIT_DIR)/src/killall5, /sbin/killall5)
 endif
 ifdef PTXCONF_SYSVINIT_SULOGIN
-	@$(call install_copy, 0, 0, 0755, $(SYSVINIT_DIR)/src/sulogin, /sbin/sulogin)
+	@$(call install_copy, sysvinit, 0, 0, 0755, $(SYSVINIT_DIR)/src/sulogin, /sbin/sulogin)
 endif
 ifdef PTXCONF_SYSVINIT_BOOTLOGD
-	@$(call install_copy, 0, 0, 0755, $(SYSVINIT_DIR)/src/bootlogd, /sbin/bootlogd)
+	@$(call install_copy, sysvinit, 0, 0, 0755, $(SYSVINIT_DIR)/src/bootlogd, /sbin/bootlogd)
 endif
 ifdef PTXCONF_SYSVINIT_WALL
-	@$(call install_copy, 0, 0, 0755, $(SYSVINIT_DIR)/src/wall, /usr/bin/wall)
+	@$(call install_copy, sysvinit, 0, 0, 0755, $(SYSVINIT_DIR)/src/wall, /usr/bin/wall)
 endif
 ifdef PTXCONF_SYSVINIT_LAST
-	@$(call install_copy, 0, 0, 0755, $(SYSVINIT_DIR)/src/last, /usr/bin/last)
+	@$(call install_copy, sysvinit, 0, 0, 0755, $(SYSVINIT_DIR)/src/last, /usr/bin/last)
 endif
 ifdef PTXCONF_SYSVINIT_MESG
-	@$(call install_copy, 0, 0, 0755, $(SYSVINIT_DIR)/src/mesg, /usr/bin/mesg)
+	@$(call install_copy, sysvinit, 0, 0, 0755, $(SYSVINIT_DIR)/src/mesg, /usr/bin/mesg)
 endif
 ifdef PTXCONF_SYSVINIT_BSDINIT
 	@$(call clean, $(BSDINIT_DIR))
 	@$(call get, $(BSDINIT_URL))
 	@$(call extract, $(BSDINIT_SOURCE))
-	@$(call install_copy, 0, 0, 0644, $(BSDINIT_DIR)/inittab, /etc/inittab, n)
-	@$(call install_copy, 0, 0, 0755, /etc/rc.d)
-	@$(call install_copy, 0, 0, 0754, $(BSDINIT_DIR)/rc.0, /etc/rc.d/rc.0, n)
-	@$(call install_copy, 0, 0, 0754, $(BSDINIT_DIR)/rc.1, /etc/rc.d/rc.1, n)
-	@$(call install_copy, 0, 0, 0754, $(BSDINIT_DIR)/rc.2, /etc/rc.d/rc.2, n)
-	@$(call install_copy, 0, 0, 0754, $(BSDINIT_DIR)/rc.5, /etc/rc.d/rc.5, n)
-	@$(call install_copy, 0, 0, 0754, $(BSDINIT_DIR)/rc.sysinit, /etc/rc.d/rc.sysinit, n) 
-	@$(call install_link, rc.2, /etc/rc.d/rc.3)
-	@$(call install_link, rc.2, /etc/rc.d/rc.4)
-	@$(call install_link, rc.0, /etc/rc.d/rc.6)
+	@$(call install_copy, sysvinit, 0, 0, 0644, $(BSDINIT_DIR)/inittab, /etc/inittab, n)
+	@$(call install_copy, sysvinit, 0, 0, 0755, /etc/rc.d)
+	@$(call install_copy, sysvinit, 0, 0, 0754, $(BSDINIT_DIR)/rc.0, /etc/rc.d/rc.0, n)
+	@$(call install_copy, sysvinit, 0, 0, 0754, $(BSDINIT_DIR)/rc.1, /etc/rc.d/rc.1, n)
+	@$(call install_copy, sysvinit, 0, 0, 0754, $(BSDINIT_DIR)/rc.2, /etc/rc.d/rc.2, n)
+	@$(call install_copy, sysvinit, 0, 0, 0754, $(BSDINIT_DIR)/rc.5, /etc/rc.d/rc.5, n)
+	@$(call install_copy, sysvinit, 0, 0, 0754, $(BSDINIT_DIR)/rc.sysinit, /etc/rc.d/rc.sysinit, n) 
+	@$(call install_link, sysvinit, rc.2, /etc/rc.d/rc.3)
+	@$(call install_link, sysvinit, rc.2, /etc/rc.d/rc.4)
+	@$(call install_link, sysvinit, rc.0, /etc/rc.d/rc.6)
 endif
 	# FIXME: RSC: this should be done by udev?
-	@$(call install_node, 0, 0, 0600, p, m, m, /dev/initctl)
+	@$(call install_node, sysvinit, 0, 0, 0600, p, m, m, /dev/initctl)
 
-	@$(call install_finish)
+	@$(call install_finish, sysvinit)
 
 	@$(call touch, $@)
 
diff --git a/rules/tcpdump.make b/rules/tcpdump.make
index c07901fed..ae9940aaf 100644
--- a/rules/tcpdump.make
+++ b/rules/tcpdump.make
@@ -112,18 +112,18 @@ tcpdump_targetinstall: $(STATEDIR)/tcpdump.targetinstall
 $(STATEDIR)/tcpdump.targetinstall: $(tcpdump_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,tcpdump)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(TCPDUMP_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(TCPDUMP_DIR)/tcpdump, /usr/sbin/tcpdump)
-
-	@$(call install_finish)
+	@$(call install_init, tcpdump)
+	@$(call install_fixup, tcpdump,PACKAGE,tcpdump)
+	@$(call install_fixup, tcpdump,PRIORITY,optional)
+	@$(call install_fixup, tcpdump,VERSION,$(TCPDUMP_VERSION))
+	@$(call install_fixup, tcpdump,SECTION,base)
+	@$(call install_fixup, tcpdump,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, tcpdump,DEPENDS,)
+	@$(call install_fixup, tcpdump,DESCRIPTION,missing)
+
+	@$(call install_copy, tcpdump, 0, 0, 0755, $(TCPDUMP_DIR)/tcpdump, /usr/sbin/tcpdump)
+
+	@$(call install_finish, tcpdump)
 
 	@$(call touch, $@)
 
diff --git a/rules/tcpwrapper.make b/rules/tcpwrapper.make
index 39b762f86..8e8d84094 100644
--- a/rules/tcpwrapper.make
+++ b/rules/tcpwrapper.make
@@ -98,19 +98,19 @@ tcpwrapper_targetinstall: $(STATEDIR)/tcpwrapper.targetinstall
 $(STATEDIR)/tcpwrapper.targetinstall: $(tcpwrapper_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,tcpwrapper)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(TCPWRAPPER_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, tcpwrapper)
+	@$(call install_fixup, tcpwrapper,PACKAGE,tcpwrapper)
+	@$(call install_fixup, tcpwrapper,PRIORITY,optional)
+	@$(call install_fixup, tcpwrapper,VERSION,$(TCPWRAPPER_VERSION))
+	@$(call install_fixup, tcpwrapper,SECTION,base)
+	@$(call install_fixup, tcpwrapper,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, tcpwrapper,DEPENDS,)
+	@$(call install_fixup, tcpwrapper,DESCRIPTION,missing)
 
 ifdef PTXCONF_TCPWRAPPER_INSTALL_TCPD
-	@$(call install_copy, 0, 0, 0755, $(TCPWRAPPER_DIR)/tcpd, /usr/sbin/tcpd)
+	@$(call install_copy, tcpwrapper, 0, 0, 0755, $(TCPWRAPPER_DIR)/tcpd, /usr/sbin/tcpd)
 endif
-	@$(call install_finish)
+	@$(call install_finish, tcpwrapper)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/termcap.make b/rules/termcap.make
index 06072a682..6cc930a9e 100644
--- a/rules/termcap.make
+++ b/rules/termcap.make
@@ -106,18 +106,20 @@ termcap_targetinstall: $(STATEDIR)/termcap.targetinstall
 $(STATEDIR)/termcap.targetinstall: $(termcap_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,termcap)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(TERMCAP_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, termcap)
+	@$(call install_fixup, termcap,PACKAGE,termcap)
+	@$(call install_fixup, termcap,PRIORITY,optional)
+	@$(call install_fixup, termcap,VERSION,$(TERMCAP_VERSION))
+	@$(call install_fixup, termcap,SECTION,base)
+	@$(call install_fixup, termcap,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, termcap,DEPENDS,)
+	@$(call install_fixup, termcap,DESCRIPTION,missing)
 	
 ifdef PTXCONF_TERMCAP_TERMCAP
-	@$(call install_copy, 0, 0, 0755, $(TERMCAP_DIR)/termcap.src, /etc/termcap.src,n)
+	@$(call install_copy, termcap, 0, 0, 0755, $(TERMCAP_DIR)/termcap.src, /etc/termcap.src,n)
 endif
+	@$(call install_finish, termcap)
+
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/thttpd.make b/rules/thttpd.make
index 16a0b1793..0768f279c 100644
--- a/rules/thttpd.make
+++ b/rules/thttpd.make
@@ -105,31 +105,31 @@ thttpd_targetinstall: $(STATEDIR)/thttpd.targetinstall
 $(STATEDIR)/thttpd.targetinstall: $(thttpd_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,thttpd)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(THTTPD_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(THTTPD_DIR)/thttpd, /usr/sbin/thttpd)
+	@$(call install_init, thttpd)
+	@$(call install_fixup, thttpd,PACKAGE,thttpd)
+	@$(call install_fixup, thttpd,PRIORITY,optional)
+	@$(call install_fixup, thttpd,VERSION,$(THTTPD_VERSION))
+	@$(call install_fixup, thttpd,SECTION,base)
+	@$(call install_fixup, thttpd,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, thttpd,DEPENDS,)
+	@$(call install_fixup, thttpd,DESCRIPTION,missing)
+
+	@$(call install_copy, thttpd, 0, 0, 0755, $(THTTPD_DIR)/thttpd, /usr/sbin/thttpd)
 ifdef PTXCONF_ROOTFS_ETC_INITD_THTTPD
 ifneq ($(call remove_quotes,$(PTXCONF_ROOTFS_ETC_INITD_THTTPD_USER_FILE)),)
-	@$(call install_copy, 0, 0, 0755, $(PTXCONF_ROOTFS_ETC_INITD_THTTPD_USER_FILE), /etc/init.d/thttpd, n)
+	@$(call install_copy, thttpd, 0, 0, 0755, $(PTXCONF_ROOTFS_ETC_INITD_THTTPD_USER_FILE), /etc/init.d/thttpd, n)
 else
-	@$(call install_copy, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/thttpd, /etc/init.d/thttpd, n)
+	@$(call install_copy, thttpd, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/thttpd, /etc/init.d/thttpd, n)
 endif
 endif
 ifneq ($(PTXCONF_ROOTFS_ETC_INITD_THTTPD_LINK),"")
-	@$(call install_copy, 0, 0, 0755, /etc/rc.d)
-	@$(call install_link, ../init.d/thttpd, /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_THTTPD_LINK))
+	@$(call install_copy, thttpd, 0, 0, 0755, /etc/rc.d)
+	@$(call install_link, thttpd, ../init.d/thttpd, /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_THTTPD_LINK))
 endif
-	@$(call install_copy, 12, 102, 0755, /var/www)
-	@$(call install_copy, 12, 102, 0644, $(PTXDIST_TOPDIR)/projects/generic/thttpd.html, /var/www/index.html, n)
+	@$(call install_copy, thttpd, 12, 102, 0755, /var/www)
+	@$(call install_copy, thttpd, 12, 102, 0644, $(PTXDIST_TOPDIR)/projects/generic/thttpd.html, /var/www/index.html, n)
 
-	@$(call install_finish)
+	@$(call install_finish, thttpd)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/treecc.make b/rules/treecc.make
index 1e818d4ff..8642446c1 100644
--- a/rules/treecc.make
+++ b/rules/treecc.make
@@ -106,18 +106,18 @@ treecc_targetinstall: $(STATEDIR)/treecc.targetinstall
 $(STATEDIR)/treecc.targetinstall: $(treecc_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,treecc)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(TREECC_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Benedikt Spranger <b.spranger\@linutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(TREECC_DIR)/treecc, /usr/bin/treecc)
-
-	@$(call install_finish)
+	@$(call install_init, treecc)
+	@$(call install_fixup, treecc,PACKAGE,treecc)
+	@$(call install_fixup, treecc,PRIORITY,optional)
+	@$(call install_fixup, treecc,VERSION,$(TREECC_VERSION))
+	@$(call install_fixup, treecc,SECTION,base)
+	@$(call install_fixup, treecc,AUTHOR,"Benedikt Spranger <b.spranger\@linutronix.de>")
+	@$(call install_fixup, treecc,DEPENDS,)
+	@$(call install_fixup, treecc,DESCRIPTION,missing)
+
+	@$(call install_copy, treecc, 0, 0, 0755, $(TREECC_DIR)/treecc, /usr/bin/treecc)
+
+	@$(call install_finish, treecc)
 
 	@$(call touch, $@)
 
diff --git a/rules/troll-ftpd.make b/rules/troll-ftpd.make
index 7ebec870a..6c56ee3f9 100644
--- a/rules/troll-ftpd.make
+++ b/rules/troll-ftpd.make
@@ -99,18 +99,18 @@ troll-ftpd_targetinstall: $(STATEDIR)/troll-ftpd.targetinstall
 $(STATEDIR)/troll-ftpd.targetinstall: $(troll-ftpd_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,trollftpd)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(TROLL-FTPD_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(TROLL-FTPD_DIR)/ftpd, /sbin/ftpd)
-
-	@$(call install_finish)
+	@$(call install_init, troll-ftpd)
+	@$(call install_fixup, troll-ftpd,PACKAGE,trollftpd)
+	@$(call install_fixup, troll-ftpd,PRIORITY,optional)
+	@$(call install_fixup, troll-ftpd,VERSION,$(TROLL-FTPD_VERSION))
+	@$(call install_fixup, troll-ftpd,SECTION,base)
+	@$(call install_fixup, troll-ftpd,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, troll-ftpd,DEPENDS,)
+	@$(call install_fixup, troll-ftpd,DESCRIPTION,missing)
+
+	@$(call install_copy, troll-ftpd, 0, 0, 0755, $(TROLL-FTPD_DIR)/ftpd, /sbin/ftpd)
+
+	@$(call install_finish, troll-ftpd)
 
 	@$(call touch, $@)
 
diff --git a/rules/tslib.make b/rules/tslib.make
index 0fc757f8b..99563dd8d 100644
--- a/rules/tslib.make
+++ b/rules/tslib.make
@@ -106,33 +106,33 @@ tslib_targetinstall: $(STATEDIR)/tslib.targetinstall
 $(STATEDIR)/tslib.targetinstall: $(tslib_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,tslib)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(TSLIB_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(TSLIB_DIR)/src/.libs/libts-0.0.so.0.1.1, /lib/libts-0.0.so.0.1.1)
-	@$(call install_link, libts-0.0.so.0.1.1, /lib/libts.so)
-	@$(call install_link, libts-0.0.so.0.1.1, /lib/libts-0.0.so.0)
+	@$(call install_init, tslib)
+	@$(call install_fixup, tslib,PACKAGE,tslib)
+	@$(call install_fixup, tslib,PRIORITY,optional)
+	@$(call install_fixup, tslib,VERSION,$(TSLIB_VERSION))
+	@$(call install_fixup, tslib,SECTION,base)
+	@$(call install_fixup, tslib,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, tslib,DEPENDS,)
+	@$(call install_fixup, tslib,DESCRIPTION,missing)
+
+	@$(call install_copy, tslib, 0, 0, 0755, $(TSLIB_DIR)/src/.libs/libts-0.0.so.0.1.1, /lib/libts-0.0.so.0.1.1)
+	@$(call install_link, tslib, libts-0.0.so.0.1.1, /lib/libts.so)
+	@$(call install_link, tslib, libts-0.0.so.0.1.1, /lib/libts-0.0.so.0)
 
 ifdef PTXCONF_TSLIB_TS_CALIBRATE
-	@$(call install_copy, 0, 0, 0755, $(TSLIB_DIR)/tests/.libs/ts_calibrate, /usr/bin/ts_calibrate)
+	@$(call install_copy, tslib, 0, 0, 0755, $(TSLIB_DIR)/tests/.libs/ts_calibrate, /usr/bin/ts_calibrate)
 endif
 ifdef PTXCONF_TSLIB_TS_TEST
-	@$(call install_copy, 0, 0, 0755, $(TSLIB_DIR)/tests/.libs/ts_test, /usr/bin/ts_test)
+	@$(call install_copy, tslib, 0, 0, 0755, $(TSLIB_DIR)/tests/.libs/ts_test, /usr/bin/ts_test)
 endif
 
-	@$(call install_copy, 0, 0, 0755, $(TSLIB_DIR)/plugins/.libs/input.so, /lib/ts/input.so)
-	@$(call install_copy, 0, 0, 0755, $(TSLIB_DIR)/plugins/.libs/pthres.so, /lib/ts/pthres.so)
-	@$(call install_copy, 0, 0, 0755, $(TSLIB_DIR)/plugins/.libs/variance.so, /lib/ts/variance.so)
-	@$(call install_copy, 0, 0, 0755, $(TSLIB_DIR)/plugins/.libs/dejitter.so, /lib/ts/dejitter.so)
-	@$(call install_copy, 0, 0, 0755, $(TSLIB_DIR)/plugins/.libs/linear.so, /lib/ts/linear.so)
+	@$(call install_copy, tslib, 0, 0, 0755, $(TSLIB_DIR)/plugins/.libs/input.so, /lib/ts/input.so)
+	@$(call install_copy, tslib, 0, 0, 0755, $(TSLIB_DIR)/plugins/.libs/pthres.so, /lib/ts/pthres.so)
+	@$(call install_copy, tslib, 0, 0, 0755, $(TSLIB_DIR)/plugins/.libs/variance.so, /lib/ts/variance.so)
+	@$(call install_copy, tslib, 0, 0, 0755, $(TSLIB_DIR)/plugins/.libs/dejitter.so, /lib/ts/dejitter.so)
+	@$(call install_copy, tslib, 0, 0, 0755, $(TSLIB_DIR)/plugins/.libs/linear.so, /lib/ts/linear.so)
 	
-	@$(call install_finish)
+	@$(call install_finish, tslib)
 
 	@$(call touch, $@)
 
diff --git a/rules/uclibc.make b/rules/uclibc.make
index 5894d482d..5cb0283fb 100644
--- a/rules/uclibc.make
+++ b/rules/uclibc.make
@@ -80,53 +80,53 @@ uclibc_targetinstall: $(STATEDIR)/uclibc.targetinstall
 $(STATEDIR)/uclibc.targetinstall: $(uclibc_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,uclibc)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(UCLIBC_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, uclibc)
+	@$(call install_fixup, uclibc,PACKAGE,uclibc)
+	@$(call install_fixup, uclibc,PRIORITY,optional)
+	@$(call install_fixup, uclibc,VERSION,$(UCLIBC_VERSION))
+	@$(call install_fixup, uclibc,SECTION,base)
+	@$(call install_fixup, uclibc,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, uclibc,DEPENDS,)
+	@$(call install_fixup, uclibc,DESCRIPTION,missing)
 
 ifdef PTXCONF_UCLIBC_INSTALL
-	@$(call install_copy_toolchain_dl, /lib)
-	@$(call install_copy_toolchain_lib, libc.so, /lib)
+	@$(call install_copy_toolchain_dl, uclibc, /lib)
+	@$(call install_copy_toolchain_lib, uclibc, libc.so, /lib)
 	# FIXME: add links	
 
 ifdef PTXCONF_UCLIBC_CRYPT
-	@$(call install_copy_toolchain_lib, libcrypt.so, /lib)
+	@$(call install_copy_toolchain_lib, uclibc, libcrypt.so, /lib)
 endif
 
 ifdef PTXCONF_UCLIBC_DL
-	@$(call install_copy_toolchain_lib, libdl.so, /lib)
+	@$(call install_copy_toolchain_lib, uclibc, libdl.so, /lib)
 endif
 
 ifdef PTXCONF_UCLIBC_M
-	@$(call install_copy_toolchain_lib, libm.so, /lib)
+	@$(call install_copy_toolchain_lib, uclibc, libm.so, /lib)
 endif
 
 ifdef PTXCONF_UCLIBC_NSL
-	@$(call install_copy_toolchain_lib, libnsl.so, /lib)
+	@$(call install_copy_toolchain_lib, uclibc, libnsl.so, /lib)
 endif
 
 ifdef PTXCONF_UCLIBC_PTHREAD
-	@$(call install_copy_toolchain_lib, libpthread.so, /lib)
+	@$(call install_copy_toolchain_lib, uclibc, libpthread.so, /lib)
 ifdef PTXCONF_GDBSERVER
-	@$(call install_copy_toolchain_lib, libthread_db.so, /lib)
+	@$(call install_copy_toolchain_lib, uclibc, libthread_db.so, /lib)
 endif
 endif
 
 ifdef PTXCONF_UCLIBC_RESOLV
-	@$(call install_copy_toolchain_lib, libresolv.so, /lib)
+	@$(call install_copy_toolchain_lib, uclibc, libresolv.so, /lib)
 endif
 
 ifdef PTXCONF_UCLIBC_UTIL
-	@$(call install_copy_toolchain_lib, libutil.so, /lib)
+	@$(call install_copy_toolchain_lib, uclibc, libutil.so, /lib)
 endif
 
 endif
-	@$(call install_finish)
+	@$(call install_finish, uclibc)
 	
 	@$(call touch, $@)
 
diff --git a/rules/udev.make b/rules/udev.make
index 1c6ce88a5..6a2d00678 100644
--- a/rules/udev.make
+++ b/rules/udev.make
@@ -101,55 +101,55 @@ udev_targetinstall: $(STATEDIR)/udev.targetinstall
 $(STATEDIR)/udev.targetinstall: $(udev_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,udev)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(UDEV_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/udev/udev.conf, /etc/udev/udev.conf, n)
+	@$(call install_init, udev)
+	@$(call install_fixup, udev,PACKAGE,udev)
+	@$(call install_fixup, udev,PRIORITY,optional)
+	@$(call install_fixup, udev,VERSION,$(UDEV_VERSION))
+	@$(call install_fixup, udev,SECTION,base)
+	@$(call install_fixup, udev,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, udev,DEPENDS,)
+	@$(call install_fixup, udev,DESCRIPTION,missing)
+
+	@$(call install_copy, udev, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/udev/udev.conf, /etc/udev/udev.conf, n)
 ifdef PTXCONF_ROOTFS_ETC_INITD_UDEV
 ifneq ($(call remove_quotes,$(PTXCONF_ROOTFS_ETC_INITD_UDEV_USER_FILE)),)
-	@$(call install_copy, 0, 0, 0755, $(PTXCONF_ROOTFS_ETC_INITD_UDEV_USER_FILE), /etc/init.d/udev, n)
+	@$(call install_copy, udev, 0, 0, 0755, $(PTXCONF_ROOTFS_ETC_INITD_UDEV_USER_FILE), /etc/init.d/udev, n)
 else
-	@$(call install_copy, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/udev, /etc/init.d/udev, n)
+	@$(call install_copy, udev, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/udev, /etc/init.d/udev, n)
 endif
 endif
 
 ifneq ($(PTXCONF_ROOTFS_ETC_INITD_UDEV_LINK),"")
-	@$(call install_copy, 0, 0, 0755, /etc/rc.d)
-	@$(call install_link, ../init.d/udev, /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_UDEV_LINK))
+	@$(call install_copy, udev, 0, 0, 0755, /etc/rc.d)
+	@$(call install_link, udev, ../init.d/udev, /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_UDEV_LINK))
 endif
 
 ifdef PTXCONF_UDEV_UDEV
-	@$(call install_copy, 0, 0, 0755, $(UDEV_DIR)/udev, /sbin/udev)
+	@$(call install_copy, udev, 0, 0, 0755, $(UDEV_DIR)/udev, /sbin/udev)
 endif
 ifdef PTXCONF_UDEV_UDEVD
-	@$(call install_copy, 0, 0, 0755, $(UDEV_DIR)/udevd, /sbin/udevd)
+	@$(call install_copy, udev, 0, 0, 0755, $(UDEV_DIR)/udevd, /sbin/udevd)
 endif
 ifdef PTXCONF_UDEV_INFO
-	@$(call install_copy, 0, 0, 0755, $(UDEV_DIR)/udevinfo, /sbin/udevinfo)
+	@$(call install_copy, udev, 0, 0, 0755, $(UDEV_DIR)/udevinfo, /sbin/udevinfo)
 endif
 ifdef PTXCONF_UDEV_SEND
-	@$(call install_copy, 0, 0, 0755, $(UDEV_DIR)/udevsend, /sbin/udevsend)
+	@$(call install_copy, udev, 0, 0, 0755, $(UDEV_DIR)/udevsend, /sbin/udevsend)
 endif
 ifdef PTXCONF_UDEV_START
-	@$(call install_copy, 0, 0, 0755, $(UDEV_DIR)/udevstart, /sbin/udevstart)
+	@$(call install_copy, udev, 0, 0, 0755, $(UDEV_DIR)/udevstart, /sbin/udevstart)
 endif
 ifdef PTXCONF_UDEV_TEST
-	@$(call install_copy, 0, 0, 0755, $(UDEV_DIR)/udevtest, /sbin/udevtest)
+	@$(call install_copy, udev, 0, 0, 0755, $(UDEV_DIR)/udevtest, /sbin/udevtest)
 endif
 
 ifdef PTXCONF_UDEV_FW_HELPER
-	@$(call install_copy, 0, 0, 0755, $(UDEV_DIR)/extras/firmware/firmware_helper, /sbin/firmware_helper)
+	@$(call install_copy, udev, 0, 0, 0755, $(UDEV_DIR)/extras/firmware/firmware_helper, /sbin/firmware_helper)
 endif
 
-	@$(call install_node, 0, 0, 0644, c, 5, 1, /dev/console)
+	@$(call install_node, udev, 0, 0, 0644, c, 5, 1, /dev/console)
 
-	@$(call install_finish)
+	@$(call install_finish, udev)
 
 	@$(call touch, $@)
 
diff --git a/rules/utelnetd.make b/rules/utelnetd.make
index 20ae3f0ca..b01c58613 100644
--- a/rules/utelnetd.make
+++ b/rules/utelnetd.make
@@ -93,31 +93,31 @@ utelnetd_targetinstall: $(STATEDIR)/utelnetd.targetinstall
 $(STATEDIR)/utelnetd.targetinstall: $(utelnetd_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,utelnetd)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(UTELNETD_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, utelnetd)
+	@$(call install_fixup, utelnetd,PACKAGE,utelnetd)
+	@$(call install_fixup, utelnetd,PRIORITY,optional)
+	@$(call install_fixup, utelnetd,VERSION,$(UTELNETD_VERSION))
+	@$(call install_fixup, utelnetd,SECTION,base)
+	@$(call install_fixup, utelnetd,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, utelnetd,DEPENDS,)
+	@$(call install_fixup, utelnetd,DESCRIPTION,missing)
 ifdef PTXCONF_ROOTFS_ETC_INITD_TELNETD
 ifdef PTXCONF_ROOTFS_ETC_INITD_TELNETD_DEFAULT 
-	@$(call install_copy, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/telnetd, /etc/init.d/telnetd, n)
+	@$(call install_copy, utelnetd, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/telnetd, /etc/init.d/telnetd, n)
 else
 ifneq ($(PTXCONF_ROOTFS_ETC_INITD_TELNETD_USER_FILE),"")
-	@$(call install_copy, 0, 0, 0755, $(PTXCONF_ROOTFS_ETC_INITD_TELNETD_USER_FILE), /etc/init.d/telnetd, n)
+	@$(call install_copy, utelnetd, 0, 0, 0755, $(PTXCONF_ROOTFS_ETC_INITD_TELNETD_USER_FILE), /etc/init.d/telnetd, n)
 endif
 endif
 endif
 ifneq ($(PTXCONF_ROOTFS_ETC_INITD_TELNETD_LINK),"")
-	@$(call install_copy, 0, 0, 0755, /etc/rc.d)
-	@$(call install_link, ../init.d/telnetd, /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_TELNETD_LINK))
+	@$(call install_copy, utelnetd, 0, 0, 0755, /etc/rc.d)
+	@$(call install_link, utelnetd, ../init.d/telnetd, /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_TELNETD_LINK))
 endif
 
-	@$(call install_copy, 0, 0, 0755, $(UTELNETD_DIR)/utelnetd, /sbin/utelnetd)
+	@$(call install_copy, utelnetd, 0, 0, 0755, $(UTELNETD_DIR)/utelnetd, /sbin/utelnetd)
 
-	@$(call install_finish)
+	@$(call install_finish, utelnetd)
 
 	@$(call touch, $@)
 
diff --git a/rules/util-linux.make b/rules/util-linux.make
index 3cec0208f..89dbc443d 100644
--- a/rules/util-linux.make
+++ b/rules/util-linux.make
@@ -129,43 +129,43 @@ util-linux_targetinstall: $(STATEDIR)/util-linux.targetinstall
 $(STATEDIR)/util-linux.targetinstall: $(util-linux_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,util-linux)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(UTIL-LINUX_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, util-linux)
+	@$(call install_fixup, util-linux,PACKAGE,util-linux)
+	@$(call install_fixup, util-linux,PRIORITY,optional)
+	@$(call install_fixup, util-linux,VERSION,$(UTIL-LINUX_VERSION))
+	@$(call install_fixup, util-linux,SECTION,base)
+	@$(call install_fixup, util-linux,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, util-linux,DEPENDS,)
+	@$(call install_fixup, util-linux,DESCRIPTION,missing)
 
 ifdef PTXCONF_UTLNX_MKSWAP
-	@$(call install_copy, 0, 0, 0755, $(UTIL-LINUX_DIR)/disk-utils/mkswap, /sbin/mkswap)
+	@$(call install_copy, util-linux, 0, 0, 0755, $(UTIL-LINUX_DIR)/disk-utils/mkswap, /sbin/mkswap)
 endif
 ifdef PTXCONF_UTLNX_SWAPON
-	@$(call install_copy, 0, 0, 0755, $(UTIL-LINUX_DIR)/mount/swapon, /sbin/swapon)
+	@$(call install_copy, util-linux, 0, 0, 0755, $(UTIL-LINUX_DIR)/mount/swapon, /sbin/swapon)
 endif
 ifdef PTXCONF_UTLNX_MOUNT
-	@$(call install_copy, 0, 0, 0755, $(UTIL-LINUX_DIR)/mount/mount, /sbin/mount)
+	@$(call install_copy, util-linux, 0, 0, 0755, $(UTIL-LINUX_DIR)/mount/mount, /sbin/mount)
 endif
 ifdef PTXCONF_UTLNX_UMOUNT
-	@$(call install_copy, 0, 0, 0755, $(UTIL-LINUX_DIR)/mount/umount, /sbin/umount)
+	@$(call install_copy, util-linux, 0, 0, 0755, $(UTIL-LINUX_DIR)/mount/umount, /sbin/umount)
 endif
 ifdef PTXCONF_UTLNX_IPCS
-	@$(call install_copy, 0, 0, 0755, $(UTIL-LINUX_DIR)/sys-utils/ipcs, /usr/bin/ipcs)
+	@$(call install_copy, util-linux, 0, 0, 0755, $(UTIL-LINUX_DIR)/sys-utils/ipcs, /usr/bin/ipcs)
 endif
 ifdef PTXCONF_UTLNX_READPROFILE
-	@$(call install_copy, 0, 0, 0755, $(UTIL-LINUX_DIR)/sys-utils/readprofile, /usr/sbin/readprofile)
+	@$(call install_copy, util-linux, 0, 0, 0755, $(UTIL-LINUX_DIR)/sys-utils/readprofile, /usr/sbin/readprofile)
 endif
 ifdef PTXCONF_UTLNX_FDISK
-	@$(call install_copy, 0, 0, 0755, $(UTIL-LINUX_DIR)/fdisk/fdisk, /usr/sbin/fdisk)
+	@$(call install_copy, util-linux, 0, 0, 0755, $(UTIL-LINUX_DIR)/fdisk/fdisk, /usr/sbin/fdisk)
 endif
 ifdef PTXCONF_UTLNX_SFDISK
-	@$(call install_copy, 0, 0, 0755, $(UTIL-LINUX_DIR)/fdisk/sfdisk, /usr/sbin/sfdisk)
+	@$(call install_copy, util-linux, 0, 0, 0755, $(UTIL-LINUX_DIR)/fdisk/sfdisk, /usr/sbin/sfdisk)
 endif
 ifdef PTXCONF_UTLNX_CFDISK
-	@$(call install_copy, 0, 0, 0755, $(UTIL-LINUX_DIR)/fdisk/cfdisk, /usr/sbin/cfdisk)
+	@$(call install_copy, util-linux, 0, 0, 0755, $(UTIL-LINUX_DIR)/fdisk/cfdisk, /usr/sbin/cfdisk)
 endif
-	@$(call install_finish)
+	@$(call install_finish, util-linux)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/valgrind.make b/rules/valgrind.make
index c5c24c235..dc275496c 100644
--- a/rules/valgrind.make
+++ b/rules/valgrind.make
@@ -117,36 +117,36 @@ valgrind_targetinstall: $(STATEDIR)/valgrind.targetinstall
 $(STATEDIR)/valgrind.targetinstall: $(valgrind_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,valgrind)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(VALGRIND_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Shahar Livne <shahar\@livnex.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(VALGRIND_DIR)/coregrind/valgrind, /bin/valgrind)
-	@$(call install_copy, 0, 0, 0644, $(VALGRIND_DIR)/coregrind/stage2, /lib/valgrind/stage2)
-	@$(call install_copy, 0, 0, 0644, $(VALGRIND_DIR)/corecheck/vgskin_corecheck.so, /lib/valgrind/vgskin_corecheck.so)
-	@$(call install_copy, 0, 0, 0644, $(VALGRIND_DIR)/massif/vgskin_massif.so, /lib/valgrind/vgskin_massif.so)
-	@$(call install_copy, 0, 0, 0644, $(VALGRIND_DIR)/massif/vgpreload_massif.so, /lib/valgrind/vgpreload_massif.so)
-	@$(call install_copy, 0, 0, 0644, $(VALGRIND_DIR)/cachegrind/vgskin_cachegrind.so, /lib/valgrind/vgskin_cachegrind.so)
-	@$(call install_copy, 0, 0, 0644, $(VALGRIND_DIR)/none/vgskin_none.so, /lib/valgrind/vgskin_none.so)
-	@$(call install_copy, 0, 0, 0644, $(VALGRIND_DIR)/addrcheck/vgpreload_addrcheck.so, /lib/valgrind/vgpreload_addrcheck.so)
-	@$(call install_copy, 0, 0, 0644, $(VALGRIND_DIR)/addrcheck/vgskin_addrcheck.so, /lib/valgrind/vgskin_addrcheck.so)
-	@$(call install_copy, 0, 0, 0644, $(VALGRIND_DIR)/memcheck/vgpreload_memcheck.so, /lib/valgrind/vgpreload_memcheck.so)
-	@$(call install_copy, 0, 0, 0644, $(VALGRIND_DIR)/memcheck/vgskin_memcheck.so, /lib/valgrind/vgskin_memcheck.so)
-	@$(call install_copy, 0, 0, 0644, $(VALGRIND_DIR)/lackey/vgskin_lackey.so, /lib/valgrind/vgskin_lackey.so)
-	@$(call install_copy, 0, 0, 0644, $(VALGRIND_DIR)/coregrind/vg_inject.so, /lib/valgrind/vg_inject.so)
-	@$(call install_copy, 0, 0, 0644, $(VALGRIND_DIR)/.in_place/default.supp, /lib/valgrind/default.supp)
-	@$(call install_copy, 0, 0, 0644, $(VALGRIND_DIR)/.in_place/glibc-2.3.supp, /lib/valgrind/glibc-2.3.supp)
-	@$(call install_copy, 0, 0, 0644, $(VALGRIND_DIR)/.in_place/glibc-2.2.supp, /lib/valgrind/glibc-2.2.supp)
-	@$(call install_copy, 0, 0, 0644, $(VALGRIND_DIR)/.in_place/glibc-2.1.supp, /lib/valgrind/glibc-2.1.supp)
-	@$(call install_copy, 0, 0, 0644, $(VALGRIND_DIR)/.in_place/xfree-4.supp, /lib/valgrind/xfree-4.supp)
-	@$(call install_copy, 0, 0, 0644, $(VALGRIND_DIR)/.in_place/xfree-3.supp, /lib/valgrind/xfree-3.supp)
-
-	@$(call install_finish)
+	@$(call install_init, valgrind)
+	@$(call install_fixup, valgrind,PACKAGE,valgrind)
+	@$(call install_fixup, valgrind,PRIORITY,optional)
+	@$(call install_fixup, valgrind,VERSION,$(VALGRIND_VERSION))
+	@$(call install_fixup, valgrind,SECTION,base)
+	@$(call install_fixup, valgrind,AUTHOR,"Shahar Livne <shahar\@livnex.com>")
+	@$(call install_fixup, valgrind,DEPENDS,)
+	@$(call install_fixup, valgrind,DESCRIPTION,missing)
+
+	@$(call install_copy, valgrind, 0, 0, 0755, $(VALGRIND_DIR)/coregrind/valgrind, /bin/valgrind)
+	@$(call install_copy, valgrind, 0, 0, 0644, $(VALGRIND_DIR)/coregrind/stage2, /lib/valgrind/stage2)
+	@$(call install_copy, valgrind, 0, 0, 0644, $(VALGRIND_DIR)/corecheck/vgskin_corecheck.so, /lib/valgrind/vgskin_corecheck.so)
+	@$(call install_copy, valgrind, 0, 0, 0644, $(VALGRIND_DIR)/massif/vgskin_massif.so, /lib/valgrind/vgskin_massif.so)
+	@$(call install_copy, valgrind, 0, 0, 0644, $(VALGRIND_DIR)/massif/vgpreload_massif.so, /lib/valgrind/vgpreload_massif.so)
+	@$(call install_copy, valgrind, 0, 0, 0644, $(VALGRIND_DIR)/cachegrind/vgskin_cachegrind.so, /lib/valgrind/vgskin_cachegrind.so)
+	@$(call install_copy, valgrind, 0, 0, 0644, $(VALGRIND_DIR)/none/vgskin_none.so, /lib/valgrind/vgskin_none.so)
+	@$(call install_copy, valgrind, 0, 0, 0644, $(VALGRIND_DIR)/addrcheck/vgpreload_addrcheck.so, /lib/valgrind/vgpreload_addrcheck.so)
+	@$(call install_copy, valgrind, 0, 0, 0644, $(VALGRIND_DIR)/addrcheck/vgskin_addrcheck.so, /lib/valgrind/vgskin_addrcheck.so)
+	@$(call install_copy, valgrind, 0, 0, 0644, $(VALGRIND_DIR)/memcheck/vgpreload_memcheck.so, /lib/valgrind/vgpreload_memcheck.so)
+	@$(call install_copy, valgrind, 0, 0, 0644, $(VALGRIND_DIR)/memcheck/vgskin_memcheck.so, /lib/valgrind/vgskin_memcheck.so)
+	@$(call install_copy, valgrind, 0, 0, 0644, $(VALGRIND_DIR)/lackey/vgskin_lackey.so, /lib/valgrind/vgskin_lackey.so)
+	@$(call install_copy, valgrind, 0, 0, 0644, $(VALGRIND_DIR)/coregrind/vg_inject.so, /lib/valgrind/vg_inject.so)
+	@$(call install_copy, valgrind, 0, 0, 0644, $(VALGRIND_DIR)/.in_place/default.supp, /lib/valgrind/default.supp)
+	@$(call install_copy, valgrind, 0, 0, 0644, $(VALGRIND_DIR)/.in_place/glibc-2.3.supp, /lib/valgrind/glibc-2.3.supp)
+	@$(call install_copy, valgrind, 0, 0, 0644, $(VALGRIND_DIR)/.in_place/glibc-2.2.supp, /lib/valgrind/glibc-2.2.supp)
+	@$(call install_copy, valgrind, 0, 0, 0644, $(VALGRIND_DIR)/.in_place/glibc-2.1.supp, /lib/valgrind/glibc-2.1.supp)
+	@$(call install_copy, valgrind, 0, 0, 0644, $(VALGRIND_DIR)/.in_place/xfree-4.supp, /lib/valgrind/xfree-4.supp)
+	@$(call install_copy, valgrind, 0, 0, 0644, $(VALGRIND_DIR)/.in_place/xfree-3.supp, /lib/valgrind/xfree-3.supp)
+
+	@$(call install_finish, valgrind)
 
 	@$(call touch, $@)
 
diff --git a/rules/wget.make b/rules/wget.make
index 4987b6883..8dbcac0ce 100644
--- a/rules/wget.make
+++ b/rules/wget.make
@@ -108,18 +108,18 @@ wget_targetinstall: $(STATEDIR)/wget.targetinstall
 $(STATEDIR)/wget.targetinstall: $(wget_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,wget)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(WGET_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(WGET_DIR)/src/wget, /usr/bin/wget)
-
-	@$(call install_finish)
+	@$(call install_init, wget)
+	@$(call install_fixup, wget,PACKAGE,wget)
+	@$(call install_fixup, wget,PRIORITY,optional)
+	@$(call install_fixup, wget,VERSION,$(WGET_VERSION))
+	@$(call install_fixup, wget,SECTION,base)
+	@$(call install_fixup, wget,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, wget,DEPENDS,)
+	@$(call install_fixup, wget,DESCRIPTION,missing)
+
+	@$(call install_copy, wget, 0, 0, 0755, $(WGET_DIR)/src/wget, /usr/bin/wget)
+
+	@$(call install_finish, wget)
 
 	@$(call touch, $@)
 
diff --git a/rules/wireless.make b/rules/wireless.make
index e1b29dac0..fb1c09cdc 100644
--- a/rules/wireless.make
+++ b/rules/wireless.make
@@ -100,28 +100,28 @@ wireless_targetinstall: $(STATEDIR)/wireless.targetinstall
 $(STATEDIR)/wireless.targetinstall: $(wireless_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,wireless)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(WIRELESS_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(WIRELESS_DIR)/iwconfig, /usr/sbin/iwconfig)
-	@$(call install_copy, 0, 0, 0755, $(WIRELESS_DIR)/iwlist, /usr/sbin/iwlist)
-	@$(call install_copy, 0, 0, 0755, $(WIRELESS_DIR)/iwpriv, /usr/sbin/iwpriv)
-	@$(call install_copy, 0, 0, 0755, $(WIRELESS_DIR)/iwspy, /usr/sbin/iwspy)
-	@$(call install_copy, 0, 0, 0755, $(WIRELESS_DIR)/iwgetid, /usr/sbin/iwgetid)
-	@$(call install_copy, 0, 0, 0755, $(WIRELESS_DIR)/iwevent, /usr/sbin/iwevent)
+	@$(call install_init, wireless)
+	@$(call install_fixup, wireless,PACKAGE,wireless)
+	@$(call install_fixup, wireless,PRIORITY,optional)
+	@$(call install_fixup, wireless,VERSION,$(WIRELESS_VERSION))
+	@$(call install_fixup, wireless,SECTION,base)
+	@$(call install_fixup, wireless,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, wireless,DEPENDS,)
+	@$(call install_fixup, wireless,DESCRIPTION,missing)
+
+	@$(call install_copy, wireless, 0, 0, 0755, $(WIRELESS_DIR)/iwconfig, /usr/sbin/iwconfig)
+	@$(call install_copy, wireless, 0, 0, 0755, $(WIRELESS_DIR)/iwlist, /usr/sbin/iwlist)
+	@$(call install_copy, wireless, 0, 0, 0755, $(WIRELESS_DIR)/iwpriv, /usr/sbin/iwpriv)
+	@$(call install_copy, wireless, 0, 0, 0755, $(WIRELESS_DIR)/iwspy, /usr/sbin/iwspy)
+	@$(call install_copy, wireless, 0, 0, 0755, $(WIRELESS_DIR)/iwgetid, /usr/sbin/iwgetid)
+	@$(call install_copy, wireless, 0, 0, 0755, $(WIRELESS_DIR)/iwevent, /usr/sbin/iwevent)
 
 ifdef PTXCONF_WIRELESS_SHARED
-	@$(call install_copy, 0, 0, 0644, $(WIRELESS_DIR)/libiw.so.$(WIRELESS_VERSION), \
+	@$(call install_copy, wireless, 0, 0, 0644, $(WIRELESS_DIR)/libiw.so.$(WIRELESS_VERSION), \
 		/usr/lib/libiw.so.$(WIRELESS_VERSION))
 endif
 
-	@$(call install_finish)
+	@$(call install_finish, wireless)
 	
 	@$(call touch, $@)
 # ----------------------------------------------------------------------------
diff --git a/rules/xalf.make b/rules/xalf.make
index 0e2409972..81b97680a 100644
--- a/rules/xalf.make
+++ b/rules/xalf.make
@@ -109,18 +109,18 @@ xalf_targetinstall: $(STATEDIR)/xalf.targetinstall
 $(STATEDIR)/xalf.targetinstall: $(xalf_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xalf)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XALF_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(XALF_DIR)/src/xalf, /usr/bin/xalf)
+	@$(call install_init, xalf)
+	@$(call install_fixup, xalf,PACKAGE,xalf)
+	@$(call install_fixup, xalf,PRIORITY,optional)
+	@$(call install_fixup, xalf,VERSION,$(XALF_VERSION))
+	@$(call install_fixup, xalf,SECTION,base)
+	@$(call install_fixup, xalf,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, xalf,DEPENDS,)
+	@$(call install_fixup, xalf,DESCRIPTION,missing)
+
+	@$(call install_copy, xalf, 0, 0, 0755, $(XALF_DIR)/src/xalf, /usr/bin/xalf)
 	
-	@$(call install_finish)
+	@$(call install_finish, xalf)
 
 	@$(call touch, $@)
 
diff --git a/rules/xmlbench.make b/rules/xmlbench.make
index d1732c49f..8cd332593 100644
--- a/rules/xmlbench.make
+++ b/rules/xmlbench.make
@@ -113,18 +113,18 @@ xmlbench_targetinstall: $(STATEDIR)/xmlbench.targetinstall
 $(STATEDIR)/xmlbench.targetinstall: $(xmlbench_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xmlbench)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XMLBENCH_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(XMLBENCH_DIR)/foobar, /dev/null)
-
-	@$(call install_finish)
+	@$(call install_init, xmlbench)
+	@$(call install_fixup, xmlbench,PACKAGE,xmlbench)
+	@$(call install_fixup, xmlbench,PRIORITY,optional)
+	@$(call install_fixup, xmlbench,VERSION,$(XMLBENCH_VERSION))
+	@$(call install_fixup, xmlbench,SECTION,base)
+	@$(call install_fixup, xmlbench,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, xmlbench,DEPENDS,)
+	@$(call install_fixup, xmlbench,DESCRIPTION,missing)
+
+	@$(call install_copy, xmlbench, 0, 0, 0755, $(XMLBENCH_DIR)/foobar, /dev/null)
+
+	@$(call install_finish, xmlbench)
 
 	@$(call touch, $@)
 
diff --git a/rules/xmlstarlet.make b/rules/xmlstarlet.make
index 7e8520dcb..3dad06e0d 100644
--- a/rules/xmlstarlet.make
+++ b/rules/xmlstarlet.make
@@ -110,18 +110,18 @@ xmlstarlet_targetinstall: $(STATEDIR)/xmlstarlet.targetinstall
 $(STATEDIR)/xmlstarlet.targetinstall: $(xmlstarlet_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xmlstarlet)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XMLSTARLET_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(XMLSTARLET_DIR)/src/xml, /usr/bin/xmlstarlet)
-
-	@$(call install_finish)
+	@$(call install_init, xmlstarlet)
+	@$(call install_fixup, xmlstarlet,PACKAGE,xmlstarlet)
+	@$(call install_fixup, xmlstarlet,PRIORITY,optional)
+	@$(call install_fixup, xmlstarlet,VERSION,$(XMLSTARLET_VERSION))
+	@$(call install_fixup, xmlstarlet,SECTION,base)
+	@$(call install_fixup, xmlstarlet,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, xmlstarlet,DEPENDS,)
+	@$(call install_fixup, xmlstarlet,DESCRIPTION,missing)
+
+	@$(call install_copy, xmlstarlet, 0, 0, 0755, $(XMLSTARLET_DIR)/src/xml, /usr/bin/xmlstarlet)
+
+	@$(call install_finish, xmlstarlet)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-app-xdm.make b/rules/xorg-app-xdm.make
index 05f4dbec6..28b250c4e 100644
--- a/rules/xorg-app-xdm.make
+++ b/rules/xorg-app-xdm.make
@@ -116,16 +116,16 @@ xorg-app-xdm_targetinstall: $(STATEDIR)/xorg-app-xdm.targetinstall
 $(STATEDIR)/xorg-app-xdm.targetinstall: $(xorg-app-xdm_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-app-xdm)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_APP_XDM_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-app-xdm)
+	@$(call install_fixup, xorg-app-xdm,PACKAGE,xorg-app-xdm)
+	@$(call install_fixup, xorg-app-xdm,PRIORITY,optional)
+	@$(call install_fixup, xorg-app-xdm,VERSION,$(XORG_APP_XDM_VERSION))
+	@$(call install_fixup, xorg-app-xdm,SECTION,base)
+	@$(call install_fixup, xorg-app-xdm,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-app-xdm,DEPENDS,)
+	@$(call install_fixup, xorg-app-xdm,DESCRIPTION,missing)
+
+	@$(call install_finish, xorg-app-xdm)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-app-xeyes.make b/rules/xorg-app-xeyes.make
index 6a0085a6c..dc14c9aea 100644
--- a/rules/xorg-app-xeyes.make
+++ b/rules/xorg-app-xeyes.make
@@ -106,18 +106,18 @@ xorg-app-xeyes_targetinstall: $(STATEDIR)/xorg-app-xeyes.targetinstall
 $(STATEDIR)/xorg-app-xeyes.targetinstall: $(xorg-app-xeyes_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-app-xeyes)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_APP_XEYES_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(XORG_APP_XEYES_DIR)/xeyes, $(XORG_PREFIX)/bin/xeyes)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-app-xeyes)
+	@$(call install_fixup, xorg-app-xeyes,PACKAGE,xorg-app-xeyes)
+	@$(call install_fixup, xorg-app-xeyes,PRIORITY,optional)
+	@$(call install_fixup, xorg-app-xeyes,VERSION,$(XORG_APP_XEYES_VERSION))
+	@$(call install_fixup, xorg-app-xeyes,SECTION,base)
+	@$(call install_fixup, xorg-app-xeyes,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, xorg-app-xeyes,DEPENDS,)
+	@$(call install_fixup, xorg-app-xeyes,DESCRIPTION,missing)
+
+	@$(call install_copy, xorg-app-xeyes, 0, 0, 0755, $(XORG_APP_XEYES_DIR)/xeyes, $(XORG_PREFIX)/bin/xeyes)
+
+	@$(call install_finish, xorg-app-xeyes)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-app-xhost.make b/rules/xorg-app-xhost.make
index d17187957..1bb386850 100644
--- a/rules/xorg-app-xhost.make
+++ b/rules/xorg-app-xhost.make
@@ -106,18 +106,18 @@ xorg-app-xhost_targetinstall: $(STATEDIR)/xorg-app-xhost.targetinstall
 $(STATEDIR)/xorg-app-xhost.targetinstall: $(xorg-app-xhost_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-app-xhost)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_APP_XHOST_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(XORG_APP_XHOST_DIR)/xhost, $(XORG_PREFIX)/bin/xhost)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-app-xhost)
+	@$(call install_fixup, xorg-app-xhost,PACKAGE,xorg-app-xhost)
+	@$(call install_fixup, xorg-app-xhost,PRIORITY,optional)
+	@$(call install_fixup, xorg-app-xhost,VERSION,$(XORG_APP_XHOST_VERSION))
+	@$(call install_fixup, xorg-app-xhost,SECTION,base)
+	@$(call install_fixup, xorg-app-xhost,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, xorg-app-xhost,DEPENDS,)
+	@$(call install_fixup, xorg-app-xhost,DESCRIPTION,missing)
+
+	@$(call install_copy, xorg-app-xhost, 0, 0, 0755, $(XORG_APP_XHOST_DIR)/xhost, $(XORG_PREFIX)/bin/xhost)
+
+	@$(call install_finish, xorg-app-xhost)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-driver-input-evdev.make b/rules/xorg-driver-input-evdev.make
index ebfa7a708..e04fde876 100644
--- a/rules/xorg-driver-input-evdev.make
+++ b/rules/xorg-driver-input-evdev.make
@@ -106,18 +106,18 @@ xorg-driver-input-evdev_targetinstall: $(STATEDIR)/xorg-driver-input-evdev.targe
 $(STATEDIR)/xorg-driver-input-evdev.targetinstall: $(xorg-driver-input-evdev_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-driver-input-evdev)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_DRIVER_INPUT_EVDEV_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-driver-input-evdev)
+	@$(call install_fixup, xorg-driver-input-evdev,PACKAGE,xorg-driver-input-evdev)
+	@$(call install_fixup, xorg-driver-input-evdev,PRIORITY,optional)
+	@$(call install_fixup, xorg-driver-input-evdev,VERSION,$(XORG_DRIVER_INPUT_EVDEV_VERSION))
+	@$(call install_fixup, xorg-driver-input-evdev,SECTION,base)
+	@$(call install_fixup, xorg-driver-input-evdev,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-driver-input-evdev,DEPENDS,)
+	@$(call install_fixup, xorg-driver-input-evdev,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-driver-input-evdev)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-driver-input-keyboard.make b/rules/xorg-driver-input-keyboard.make
index 72c794d9d..6f893aba4 100644
--- a/rules/xorg-driver-input-keyboard.make
+++ b/rules/xorg-driver-input-keyboard.make
@@ -106,18 +106,18 @@ xorg-driver-input-keyboard_targetinstall: $(STATEDIR)/xorg-driver-input-keyboard
 $(STATEDIR)/xorg-driver-input-keyboard.targetinstall: $(xorg-driver-input-keyboard_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-driver-input-keyboard)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_DRIVER_INPUT_KEYBOARD_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(XORG_DRIVER_INPUT_KEYBOARD_DIR)/src/.libs/keyboard_drv.so, /usr/lib/xorg/modules/keyboard_drv.so)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-driver-input-keyboard)
+	@$(call install_fixup, xorg-driver-input-keyboard,PACKAGE,xorg-driver-input-keyboard)
+	@$(call install_fixup, xorg-driver-input-keyboard,PRIORITY,optional)
+	@$(call install_fixup, xorg-driver-input-keyboard,VERSION,$(XORG_DRIVER_INPUT_KEYBOARD_VERSION))
+	@$(call install_fixup, xorg-driver-input-keyboard,SECTION,base)
+	@$(call install_fixup, xorg-driver-input-keyboard,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-driver-input-keyboard,DEPENDS,)
+	@$(call install_fixup, xorg-driver-input-keyboard,DESCRIPTION,missing)
+
+	@$(call install_copy, xorg-driver-input-keyboard, 0, 0, 0755, $(XORG_DRIVER_INPUT_KEYBOARD_DIR)/src/.libs/keyboard_drv.so, /usr/lib/xorg/modules/keyboard_drv.so)
+
+	@$(call install_finish, xorg-driver-input-keyboard)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-driver-input-mouse.make b/rules/xorg-driver-input-mouse.make
index 5670edf7b..cd4dc56d7 100644
--- a/rules/xorg-driver-input-mouse.make
+++ b/rules/xorg-driver-input-mouse.make
@@ -106,18 +106,18 @@ xorg-driver-input-mouse_targetinstall: $(STATEDIR)/xorg-driver-input-mouse.targe
 $(STATEDIR)/xorg-driver-input-mouse.targetinstall: $(xorg-driver-input-mouse_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-driver-input-mouse)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_DRIVER_INPUT_MOUSE_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(XORG_DRIVER_INPUT_MOUSE_DIR)/src/.libs/mouse_drv.so, /usr/lib/xorg/modules/mouse_drv.so)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-driver-input-mouse)
+	@$(call install_fixup, xorg-driver-input-mouse,PACKAGE,xorg-driver-input-mouse)
+	@$(call install_fixup, xorg-driver-input-mouse,PRIORITY,optional)
+	@$(call install_fixup, xorg-driver-input-mouse,VERSION,$(XORG_DRIVER_INPUT_MOUSE_VERSION))
+	@$(call install_fixup, xorg-driver-input-mouse,SECTION,base)
+	@$(call install_fixup, xorg-driver-input-mouse,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-driver-input-mouse,DEPENDS,)
+	@$(call install_fixup, xorg-driver-input-mouse,DESCRIPTION,missing)
+
+	@$(call install_copy, xorg-driver-input-mouse, 0, 0, 0755, $(XORG_DRIVER_INPUT_MOUSE_DIR)/src/.libs/mouse_drv.so, /usr/lib/xorg/modules/mouse_drv.so)
+
+	@$(call install_finish, xorg-driver-input-mouse)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-driver-input-void.make b/rules/xorg-driver-input-void.make
index 25e5b294c..6de14eb85 100644
--- a/rules/xorg-driver-input-void.make
+++ b/rules/xorg-driver-input-void.make
@@ -106,19 +106,19 @@ xorg-driver-input-void_targetinstall: $(STATEDIR)/xorg-driver-input-void.targeti
 $(STATEDIR)/xorg-driver-input-void.targetinstall: $(xorg-driver-input-void_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-driver-input-void)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_DRIVER_INPUT_VOID_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-driver-input-void)
+	@$(call install_fixup, xorg-driver-input-void,PACKAGE,xorg-driver-input-void)
+	@$(call install_fixup, xorg-driver-input-void,PRIORITY,optional)
+	@$(call install_fixup, xorg-driver-input-void,VERSION,$(XORG_DRIVER_INPUT_VOID_VERSION))
+	@$(call install_fixup, xorg-driver-input-void,SECTION,base)
+	@$(call install_fixup, xorg-driver-input-void,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-driver-input-void,DEPENDS,)
+	@$(call install_fixup, xorg-driver-input-void,DESCRIPTION,missing)
 
 #FIXME
 
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-driver-input-void)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-driver-video-apm.make b/rules/xorg-driver-video-apm.make
index 1edede7e5..e9ec6cb41 100644
--- a/rules/xorg-driver-video-apm.make
+++ b/rules/xorg-driver-video-apm.make
@@ -106,18 +106,18 @@ xorg-driver-video-apm_targetinstall: $(STATEDIR)/xorg-driver-video-apm.targetins
 $(STATEDIR)/xorg-driver-video-apm.targetinstall: $(xorg-driver-video-apm_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-driver-video-apm)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_DRIVER_VIDEO_APM_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-driver-video-apm)
+	@$(call install_fixup, xorg-driver-video-apm,PACKAGE,xorg-driver-video-apm)
+	@$(call install_fixup, xorg-driver-video-apm,PRIORITY,optional)
+	@$(call install_fixup, xorg-driver-video-apm,VERSION,$(XORG_DRIVER_VIDEO_APM_VERSION))
+	@$(call install_fixup, xorg-driver-video-apm,SECTION,base)
+	@$(call install_fixup, xorg-driver-video-apm,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-driver-video-apm,DEPENDS,)
+	@$(call install_fixup, xorg-driver-video-apm,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-driver-video-apm)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-driver-video-ati.make b/rules/xorg-driver-video-ati.make
index 6976b083c..a68f68f31 100644
--- a/rules/xorg-driver-video-ati.make
+++ b/rules/xorg-driver-video-ati.make
@@ -112,18 +112,18 @@ xorg-driver-video-ati_targetinstall: $(STATEDIR)/xorg-driver-video-ati.targetins
 $(STATEDIR)/xorg-driver-video-ati.targetinstall: $(xorg-driver-video-ati_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-driver-video-ati)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_DRIVER_VIDEO_ATI_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-driver-video-ati)
+	@$(call install_fixup, xorg-driver-video-ati,PACKAGE,xorg-driver-video-ati)
+	@$(call install_fixup, xorg-driver-video-ati,PRIORITY,optional)
+	@$(call install_fixup, xorg-driver-video-ati,VERSION,$(XORG_DRIVER_VIDEO_ATI_VERSION))
+	@$(call install_fixup, xorg-driver-video-ati,SECTION,base)
+	@$(call install_fixup, xorg-driver-video-ati,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-driver-video-ati,DEPENDS,)
+	@$(call install_fixup, xorg-driver-video-ati,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-driver-video-ati)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-driver-video-dummy.make b/rules/xorg-driver-video-dummy.make
index feb744271..01dcff3d9 100644
--- a/rules/xorg-driver-video-dummy.make
+++ b/rules/xorg-driver-video-dummy.make
@@ -106,18 +106,18 @@ xorg-driver-video-dummy_targetinstall: $(STATEDIR)/xorg-driver-video-dummy.targe
 $(STATEDIR)/xorg-driver-video-dummy.targetinstall: $(xorg-driver-video-dummy_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-driver-video-dummy)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_DRIVER_VIDEO_DUMMY_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-driver-video-dummy)
+	@$(call install_fixup, xorg-driver-video-dummy,PACKAGE,xorg-driver-video-dummy)
+	@$(call install_fixup, xorg-driver-video-dummy,PRIORITY,optional)
+	@$(call install_fixup, xorg-driver-video-dummy,VERSION,$(XORG_DRIVER_VIDEO_DUMMY_VERSION))
+	@$(call install_fixup, xorg-driver-video-dummy,SECTION,base)
+	@$(call install_fixup, xorg-driver-video-dummy,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-driver-video-dummy,DEPENDS,)
+	@$(call install_fixup, xorg-driver-video-dummy,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-driver-video-dummy)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-driver-video-fbdev.make b/rules/xorg-driver-video-fbdev.make
index a70ea1ed0..57cbf0321 100644
--- a/rules/xorg-driver-video-fbdev.make
+++ b/rules/xorg-driver-video-fbdev.make
@@ -106,18 +106,18 @@ xorg-driver-video-fbdev_targetinstall: $(STATEDIR)/xorg-driver-video-fbdev.targe
 $(STATEDIR)/xorg-driver-video-fbdev.targetinstall: $(xorg-driver-video-fbdev_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-driver-video-fbdev)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_DRIVER_VIDEO_FBDEV_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(XORG_DRIVER_VIDEO_FBDEV_DIR)/src/.libs/fbdev_drv.so, /usr/lib/xorg/modules/fbdev_drv.so)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-driver-video-fbdev)
+	@$(call install_fixup, xorg-driver-video-fbdev,PACKAGE,xorg-driver-video-fbdev)
+	@$(call install_fixup, xorg-driver-video-fbdev,PRIORITY,optional)
+	@$(call install_fixup, xorg-driver-video-fbdev,VERSION,$(XORG_DRIVER_VIDEO_FBDEV_VERSION))
+	@$(call install_fixup, xorg-driver-video-fbdev,SECTION,base)
+	@$(call install_fixup, xorg-driver-video-fbdev,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-driver-video-fbdev,DEPENDS,)
+	@$(call install_fixup, xorg-driver-video-fbdev,DESCRIPTION,missing)
+
+	@$(call install_copy, xorg-driver-video-fbdev, 0, 0, 0755, $(XORG_DRIVER_VIDEO_FBDEV_DIR)/src/.libs/fbdev_drv.so, /usr/lib/xorg/modules/fbdev_drv.so)
+
+	@$(call install_finish, xorg-driver-video-fbdev)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-adobe-100dpi.make b/rules/xorg-font-adobe-100dpi.make
index 260968559..dca466ced 100644
--- a/rules/xorg-font-adobe-100dpi.make
+++ b/rules/xorg-font-adobe-100dpi.make
@@ -106,21 +106,21 @@ xorg-font-adobe-100dpi_targetinstall: $(STATEDIR)/xorg-font-adobe-100dpi.targeti
 $(STATEDIR)/xorg-font-adobe-100dpi.targetinstall: $(xorg-font-adobe-100dpi_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-adobe-100dpi)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_ADOBE_100DPI_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-adobe-100dpi)
+	@$(call install_fixup, xorg-font-adobe-100dpi,PACKAGE,xorg-font-adobe-100dpi)
+	@$(call install_fixup, xorg-font-adobe-100dpi,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-adobe-100dpi,VERSION,$(XORG_FONT_ADOBE_100DPI_VERSION))
+	@$(call install_fixup, xorg-font-adobe-100dpi,SECTION,base)
+	@$(call install_fixup, xorg-font-adobe-100dpi,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-adobe-100dpi,DEPENDS,)
+	@$(call install_fixup, xorg-font-adobe-100dpi,DESCRIPTION,missing)
 
 	@cd $(XORG_FONT_ADOBE_100DPI_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \
+		$(call install_copy, xorg-font-adobe-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-adobe-100dpi)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-adobe-75dpi.make b/rules/xorg-font-adobe-75dpi.make
index 7625ab0bb..6a4a46d33 100644
--- a/rules/xorg-font-adobe-75dpi.make
+++ b/rules/xorg-font-adobe-75dpi.make
@@ -106,22 +106,22 @@ xorg-font-adobe-75dpi_targetinstall: $(STATEDIR)/xorg-font-adobe-75dpi.targetins
 $(STATEDIR)/xorg-font-adobe-75dpi.targetinstall: $(xorg-font-adobe-75dpi_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-adobe-75dpi)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_ADOBE_75DPI_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-adobe-75dpi)
+	@$(call install_fixup, xorg-font-adobe-75dpi,PACKAGE,xorg-font-adobe-75dpi)
+	@$(call install_fixup, xorg-font-adobe-75dpi,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-adobe-75dpi,VERSION,$(XORG_FONT_ADOBE_75DPI_VERSION))
+	@$(call install_fixup, xorg-font-adobe-75dpi,SECTION,base)
+	@$(call install_fixup, xorg-font-adobe-75dpi,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-adobe-75dpi,DEPENDS,)
+	@$(call install_fixup, xorg-font-adobe-75dpi,DESCRIPTION,missing)
 
 	@cd $(XORG_FONT_ADOBE_75DPI_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \
+		$(call install_copy, xorg-font-adobe-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \
 	done
 
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-adobe-75dpi)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-adobe-utopia-100dpi.make b/rules/xorg-font-adobe-utopia-100dpi.make
index 678ec5518..06215e720 100644
--- a/rules/xorg-font-adobe-utopia-100dpi.make
+++ b/rules/xorg-font-adobe-utopia-100dpi.make
@@ -106,21 +106,21 @@ xorg-font-adobe-utopia-100dpi_targetinstall: $(STATEDIR)/xorg-font-adobe-utopia-
 $(STATEDIR)/xorg-font-adobe-utopia-100dpi.targetinstall: $(xorg-font-adobe-utopia-100dpi_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-adobe-utopia-100dpi)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_ADOBE_UTOPIA_100DPI_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-adobe-utopia-100dpi)
+	@$(call install_fixup, xorg-font-adobe-utopia-100dpi,PACKAGE,xorg-font-adobe-utopia-100dpi)
+	@$(call install_fixup, xorg-font-adobe-utopia-100dpi,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-adobe-utopia-100dpi,VERSION,$(XORG_FONT_ADOBE_UTOPIA_100DPI_VERSION))
+	@$(call install_fixup, xorg-font-adobe-utopia-100dpi,SECTION,base)
+	@$(call install_fixup, xorg-font-adobe-utopia-100dpi,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-adobe-utopia-100dpi,DEPENDS,)
+	@$(call install_fixup, xorg-font-adobe-utopia-100dpi,DESCRIPTION,missing)
 
 	@cd $(XORG_FONT_ADOBE_UTOPIA_100DPI_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \
+		$(call install_copy, xorg-font-adobe-utopia-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-adobe-utopia-100dpi)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-adobe-utopia-75dpi.make b/rules/xorg-font-adobe-utopia-75dpi.make
index db752dd77..db1e99e9c 100644
--- a/rules/xorg-font-adobe-utopia-75dpi.make
+++ b/rules/xorg-font-adobe-utopia-75dpi.make
@@ -106,21 +106,21 @@ xorg-font-adobe-utopia-75dpi_targetinstall: $(STATEDIR)/xorg-font-adobe-utopia-7
 $(STATEDIR)/xorg-font-adobe-utopia-75dpi.targetinstall: $(xorg-font-adobe-utopia-75dpi_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-adobe-utopia-75dpi)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_ADOBE_UTOPIA_75DPI_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-adobe-utopia-75dpi)
+	@$(call install_fixup, xorg-font-adobe-utopia-75dpi,PACKAGE,xorg-font-adobe-utopia-75dpi)
+	@$(call install_fixup, xorg-font-adobe-utopia-75dpi,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-adobe-utopia-75dpi,VERSION,$(XORG_FONT_ADOBE_UTOPIA_75DPI_VERSION))
+	@$(call install_fixup, xorg-font-adobe-utopia-75dpi,SECTION,base)
+	@$(call install_fixup, xorg-font-adobe-utopia-75dpi,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-adobe-utopia-75dpi,DEPENDS,)
+	@$(call install_fixup, xorg-font-adobe-utopia-75dpi,DESCRIPTION,missing)
 
 	@cd $(XORG_FONT_ADOBE_UTOPIA_75DPI_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \
+		$(call install_copy, xorg-font-adobe-utopia-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-adobe-utopia-75dpi)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-adobe-utopia-type1.make b/rules/xorg-font-adobe-utopia-type1.make
index 114b16df7..0d291cdcf 100644
--- a/rules/xorg-font-adobe-utopia-type1.make
+++ b/rules/xorg-font-adobe-utopia-type1.make
@@ -106,21 +106,21 @@ xorg-font-adobe-utopia-type1_targetinstall: $(STATEDIR)/xorg-font-adobe-utopia-t
 $(STATEDIR)/xorg-font-adobe-utopia-type1.targetinstall: $(xorg-font-adobe-utopia-type1_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-adobe-utopia-type1)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_ADOBE_UTOPIA_TYPE1_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-adobe-utopia-type1)
+	@$(call install_fixup, xorg-font-adobe-utopia-type1,PACKAGE,xorg-font-adobe-utopia-type1)
+	@$(call install_fixup, xorg-font-adobe-utopia-type1,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-adobe-utopia-type1,VERSION,$(XORG_FONT_ADOBE_UTOPIA_TYPE1_VERSION))
+	@$(call install_fixup, xorg-font-adobe-utopia-type1,SECTION,base)
+	@$(call install_fixup, xorg-font-adobe-utopia-type1,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-adobe-utopia-type1,DEPENDS,)
+	@$(call install_fixup, xorg-font-adobe-utopia-type1,DESCRIPTION,missing)
 
 	@cd $(XORG_FONT_ADOBE_UTOPIA_TYPE1_DIR); \
 	for file in *.afm *.pfa; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/Type1/$$file, n); \
+		$(call install_copy, xorg-font-adobe-utopia-type1, 0, 0, 0644, $$file, $(XORG_FONTDIR)/Type1/$$file, n); \
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-adobe-utopia-type1)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-alias.make b/rules/xorg-font-alias.make
index 82b5dae1d..f439be806 100644
--- a/rules/xorg-font-alias.make
+++ b/rules/xorg-font-alias.make
@@ -106,21 +106,21 @@ xorg-font-alias_targetinstall: $(STATEDIR)/xorg-font-alias.targetinstall
 $(STATEDIR)/xorg-font-alias.targetinstall: $(xorg-font-alias_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-alias)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_ALIAS_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, $(XORG_FONT_ALIAS_DIR)/100dpi/fonts.alias, $(XORG_FONTDIR)/100dpi/fonts.alias)
-	@$(call install_copy, 0, 0, 0644, $(XORG_FONT_ALIAS_DIR)/75dpi/fonts.alias, $(XORG_FONTDIR)/75dpi/fonts.alias)
-	@$(call install_copy, 0, 0, 0644, $(XORG_FONT_ALIAS_DIR)/cyrillic/fonts.alias, $(XORG_FONTDIR)/cyrillic/fonts.alias)
-	@$(call install_copy, 0, 0, 0644, $(XORG_FONT_ALIAS_DIR)/misc/fonts.alias, $(XORG_FONTDIR)/misc/fonts.alias)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-font-alias)
+	@$(call install_fixup, xorg-font-alias,PACKAGE,xorg-font-alias)
+	@$(call install_fixup, xorg-font-alias,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-alias,VERSION,$(XORG_FONT_ALIAS_VERSION))
+	@$(call install_fixup, xorg-font-alias,SECTION,base)
+	@$(call install_fixup, xorg-font-alias,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-alias,DEPENDS,)
+	@$(call install_fixup, xorg-font-alias,DESCRIPTION,missing)
+
+	@$(call install_copy, xorg-font-alias, 0, 0, 0644, $(XORG_FONT_ALIAS_DIR)/100dpi/fonts.alias, $(XORG_FONTDIR)/100dpi/fonts.alias)
+	@$(call install_copy, xorg-font-alias, 0, 0, 0644, $(XORG_FONT_ALIAS_DIR)/75dpi/fonts.alias, $(XORG_FONTDIR)/75dpi/fonts.alias)
+	@$(call install_copy, xorg-font-alias, 0, 0, 0644, $(XORG_FONT_ALIAS_DIR)/cyrillic/fonts.alias, $(XORG_FONTDIR)/cyrillic/fonts.alias)
+	@$(call install_copy, xorg-font-alias, 0, 0, 0644, $(XORG_FONT_ALIAS_DIR)/misc/fonts.alias, $(XORG_FONTDIR)/misc/fonts.alias)
+
+	@$(call install_finish, xorg-font-alias)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-arabic-misc.make b/rules/xorg-font-arabic-misc.make
index c5fc5f5bb..792d0c787 100644
--- a/rules/xorg-font-arabic-misc.make
+++ b/rules/xorg-font-arabic-misc.make
@@ -106,21 +106,21 @@ xorg-font-arabic-misc_targetinstall: $(STATEDIR)/xorg-font-arabic-misc.targetins
 $(STATEDIR)/xorg-font-arabic-misc.targetinstall: $(xorg-font-arabic-misc_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-arabic-misc)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_ARABIC_MISC_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-arabic-misc)
+	@$(call install_fixup, xorg-font-arabic-misc,PACKAGE,xorg-font-arabic-misc)
+	@$(call install_fixup, xorg-font-arabic-misc,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-arabic-misc,VERSION,$(XORG_FONT_ARABIC_MISC_VERSION))
+	@$(call install_fixup, xorg-font-arabic-misc,SECTION,base)
+	@$(call install_fixup, xorg-font-arabic-misc,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-arabic-misc,DEPENDS,)
+	@$(call install_fixup, xorg-font-arabic-misc,DESCRIPTION,missing)
 
 	@cd $(XORG_FONT_ARABIC_MISC_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
+		$(call install_copy, xorg-font-arabic-misc, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-arabic-misc)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-bh-100dpi.make b/rules/xorg-font-bh-100dpi.make
index 371e7c7b5..9e463e060 100644
--- a/rules/xorg-font-bh-100dpi.make
+++ b/rules/xorg-font-bh-100dpi.make
@@ -106,21 +106,21 @@ xorg-font-bh-100dpi_targetinstall: $(STATEDIR)/xorg-font-bh-100dpi.targetinstall
 $(STATEDIR)/xorg-font-bh-100dpi.targetinstall: $(xorg-font-bh-100dpi_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-bh-100dpi)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_BH_100DPI_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-bh-100dpi)
+	@$(call install_fixup, xorg-font-bh-100dpi,PACKAGE,xorg-font-bh-100dpi)
+	@$(call install_fixup, xorg-font-bh-100dpi,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-bh-100dpi,VERSION,$(XORG_FONT_BH_100DPI_VERSION))
+	@$(call install_fixup, xorg-font-bh-100dpi,SECTION,base)
+	@$(call install_fixup, xorg-font-bh-100dpi,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-bh-100dpi,DEPENDS,)
+	@$(call install_fixup, xorg-font-bh-100dpi,DESCRIPTION,missing)
 
 	@cd $(XORG_FONT_BH_100DPI_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \
+		$(call install_copy, xorg-font-bh-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-bh-100dpi)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-bh-75dpi.make b/rules/xorg-font-bh-75dpi.make
index 0b73467de..6bf9c3795 100644
--- a/rules/xorg-font-bh-75dpi.make
+++ b/rules/xorg-font-bh-75dpi.make
@@ -106,21 +106,21 @@ xorg-font-bh-75dpi_targetinstall: $(STATEDIR)/xorg-font-bh-75dpi.targetinstall
 $(STATEDIR)/xorg-font-bh-75dpi.targetinstall: $(xorg-font-bh-75dpi_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-bh-75dpi)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_BH_75DPI_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-bh-75dpi)
+	@$(call install_fixup, xorg-font-bh-75dpi,PACKAGE,xorg-font-bh-75dpi)
+	@$(call install_fixup, xorg-font-bh-75dpi,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-bh-75dpi,VERSION,$(XORG_FONT_BH_75DPI_VERSION))
+	@$(call install_fixup, xorg-font-bh-75dpi,SECTION,base)
+	@$(call install_fixup, xorg-font-bh-75dpi,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-bh-75dpi,DEPENDS,)
+	@$(call install_fixup, xorg-font-bh-75dpi,DESCRIPTION,missing)
 
 	@cd $(XORG_FONT_BH_75DPI_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \
+		$(call install_copy, xorg-font-bh-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-bh-75dpi)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-bh-lucidatypewriter-100dpi.make b/rules/xorg-font-bh-lucidatypewriter-100dpi.make
index e8c6f9536..0e83c1c57 100644
--- a/rules/xorg-font-bh-lucidatypewriter-100dpi.make
+++ b/rules/xorg-font-bh-lucidatypewriter-100dpi.make
@@ -106,21 +106,21 @@ xorg-font-bh-lucidatypewriter-100dpi_targetinstall: $(STATEDIR)/xorg-font-bh-luc
 $(STATEDIR)/xorg-font-bh-lucidatypewriter-100dpi.targetinstall: $(xorg-font-bh-lucidatypewriter-100dpi_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-bh-lucidatypewriter-100dpi)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-bh-lucidatypewriter-100dpi)
+	@$(call install_fixup, xorg-font-bh-lucidatypewriter-100dpi,PACKAGE,xorg-font-bh-lucidatypewriter-100dpi)
+	@$(call install_fixup, xorg-font-bh-lucidatypewriter-100dpi,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-bh-lucidatypewriter-100dpi,VERSION,$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_VERSION))
+	@$(call install_fixup, xorg-font-bh-lucidatypewriter-100dpi,SECTION,base)
+	@$(call install_fixup, xorg-font-bh-lucidatypewriter-100dpi,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-bh-lucidatypewriter-100dpi,DEPENDS,)
+	@$(call install_fixup, xorg-font-bh-lucidatypewriter-100dpi,DESCRIPTION,missing)
 
 	@cd $(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \
+		$(call install_copy, xorg-font-bh-lucidatypewriter-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-bh-lucidatypewriter-100dpi)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-bh-lucidatypewriter-75dpi.make b/rules/xorg-font-bh-lucidatypewriter-75dpi.make
index 83edceff8..02cebb28d 100644
--- a/rules/xorg-font-bh-lucidatypewriter-75dpi.make
+++ b/rules/xorg-font-bh-lucidatypewriter-75dpi.make
@@ -106,21 +106,21 @@ xorg-font-bh-lucidatypewriter-75dpi_targetinstall: $(STATEDIR)/xorg-font-bh-luci
 $(STATEDIR)/xorg-font-bh-lucidatypewriter-75dpi.targetinstall: $(xorg-font-bh-lucidatypewriter-75dpi_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-bh-lucidatypewriter-75dpi)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-bh-lucidatypewriter-75dpi)
+	@$(call install_fixup, xorg-font-bh-lucidatypewriter-75dpi,PACKAGE,xorg-font-bh-lucidatypewriter-75dpi)
+	@$(call install_fixup, xorg-font-bh-lucidatypewriter-75dpi,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-bh-lucidatypewriter-75dpi,VERSION,$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_VERSION))
+	@$(call install_fixup, xorg-font-bh-lucidatypewriter-75dpi,SECTION,base)
+	@$(call install_fixup, xorg-font-bh-lucidatypewriter-75dpi,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-bh-lucidatypewriter-75dpi,DEPENDS,)
+	@$(call install_fixup, xorg-font-bh-lucidatypewriter-75dpi,DESCRIPTION,missing)
 
 	@cd $(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \
+		$(call install_copy, xorg-font-bh-lucidatypewriter-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-bh-lucidatypewriter-75dpi)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-bh-ttf.make b/rules/xorg-font-bh-ttf.make
index 75700edc7..3ba39afc5 100644
--- a/rules/xorg-font-bh-ttf.make
+++ b/rules/xorg-font-bh-ttf.make
@@ -106,18 +106,18 @@ xorg-font-bh-ttf_targetinstall: $(STATEDIR)/xorg-font-bh-ttf.targetinstall
 $(STATEDIR)/xorg-font-bh-ttf.targetinstall: $(xorg-font-bh-ttf_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-bh-ttf)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_BH_TTF_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-bh-ttf)
+	@$(call install_fixup, xorg-font-bh-ttf,PACKAGE,xorg-font-bh-ttf)
+	@$(call install_fixup, xorg-font-bh-ttf,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-bh-ttf,VERSION,$(XORG_FONT_BH_TTF_VERSION))
+	@$(call install_fixup, xorg-font-bh-ttf,SECTION,base)
+	@$(call install_fixup, xorg-font-bh-ttf,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-bh-ttf,DEPENDS,)
+	@$(call install_fixup, xorg-font-bh-ttf,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-bh-ttf)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-bitstream-100dpi.make b/rules/xorg-font-bitstream-100dpi.make
index b6cc763d8..365808c5b 100644
--- a/rules/xorg-font-bitstream-100dpi.make
+++ b/rules/xorg-font-bitstream-100dpi.make
@@ -106,21 +106,21 @@ xorg-font-bitstream-100dpi_targetinstall: $(STATEDIR)/xorg-font-bitstream-100dpi
 $(STATEDIR)/xorg-font-bitstream-100dpi.targetinstall: $(xorg-font-bitstream-100dpi_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-bitstream-100dpi)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_BITSTREAM_100DPI_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-bitstream-100dpi)
+	@$(call install_fixup, xorg-font-bitstream-100dpi,PACKAGE,xorg-font-bitstream-100dpi)
+	@$(call install_fixup, xorg-font-bitstream-100dpi,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-bitstream-100dpi,VERSION,$(XORG_FONT_BITSTREAM_100DPI_VERSION))
+	@$(call install_fixup, xorg-font-bitstream-100dpi,SECTION,base)
+	@$(call install_fixup, xorg-font-bitstream-100dpi,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-bitstream-100dpi,DEPENDS,)
+	@$(call install_fixup, xorg-font-bitstream-100dpi,DESCRIPTION,missing)
 
 	@cd $(XORG_FONT_BITSTREAM_100DPI_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \
+		$(call install_copy, xorg-font-bitstream-100dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/100dpi/$$file, n); \
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-bitstream-100dpi)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-bitstream-75dpi.make b/rules/xorg-font-bitstream-75dpi.make
index edbc644a2..b851832f4 100644
--- a/rules/xorg-font-bitstream-75dpi.make
+++ b/rules/xorg-font-bitstream-75dpi.make
@@ -106,21 +106,21 @@ xorg-font-bitstream-75dpi_targetinstall: $(STATEDIR)/xorg-font-bitstream-75dpi.t
 $(STATEDIR)/xorg-font-bitstream-75dpi.targetinstall: $(xorg-font-bitstream-75dpi_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-bitstream-75dpi)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_BITSTREAM_75DPI_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-bitstream-75dpi)
+	@$(call install_fixup, xorg-font-bitstream-75dpi,PACKAGE,xorg-font-bitstream-75dpi)
+	@$(call install_fixup, xorg-font-bitstream-75dpi,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-bitstream-75dpi,VERSION,$(XORG_FONT_BITSTREAM_75DPI_VERSION))
+	@$(call install_fixup, xorg-font-bitstream-75dpi,SECTION,base)
+	@$(call install_fixup, xorg-font-bitstream-75dpi,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-bitstream-75dpi,DEPENDS,)
+	@$(call install_fixup, xorg-font-bitstream-75dpi,DESCRIPTION,missing)
 
 	@cd $(XORG_FONT_BITSTREAM_75DPI_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \
+		$(call install_copy, xorg-font-bitstream-75dpi, 0, 0, 0644, $$file, $(XORG_FONTDIR)/75dpi/$$file, n); \
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-bitstream-75dpi)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-bitstream-speedo.make b/rules/xorg-font-bitstream-speedo.make
index 31dfe9011..1307ed2d9 100644
--- a/rules/xorg-font-bitstream-speedo.make
+++ b/rules/xorg-font-bitstream-speedo.make
@@ -106,21 +106,21 @@ xorg-font-bitstream-speedo_targetinstall: $(STATEDIR)/xorg-font-bitstream-speedo
 $(STATEDIR)/xorg-font-bitstream-speedo.targetinstall: $(xorg-font-bitstream-speedo_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-bitstream-speedo)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_BITSTREAM_SPEEDO_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-bitstream-speedo)
+	@$(call install_fixup, xorg-font-bitstream-speedo,PACKAGE,xorg-font-bitstream-speedo)
+	@$(call install_fixup, xorg-font-bitstream-speedo,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-bitstream-speedo,VERSION,$(XORG_FONT_BITSTREAM_SPEEDO_VERSION))
+	@$(call install_fixup, xorg-font-bitstream-speedo,SECTION,base)
+	@$(call install_fixup, xorg-font-bitstream-speedo,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-bitstream-speedo,DEPENDS,)
+	@$(call install_fixup, xorg-font-bitstream-speedo,DESCRIPTION,missing)
 
 	@cd $(XORG_FONT_BITSTREAM_SPEEDO_DIR); \
 	for file in *.spd; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/Speedo/$$file, n); \
+		$(call install_copy, xorg-font-bitstream-speedo, 0, 0, 0644, $$file, $(XORG_FONTDIR)/Speedo/$$file, n); \
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-bitstream-speedo)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-bitstream-type1.make b/rules/xorg-font-bitstream-type1.make
index d0eef2724..877eb568c 100644
--- a/rules/xorg-font-bitstream-type1.make
+++ b/rules/xorg-font-bitstream-type1.make
@@ -106,21 +106,21 @@ xorg-font-bitstream-type1_targetinstall: $(STATEDIR)/xorg-font-bitstream-type1.t
 $(STATEDIR)/xorg-font-bitstream-type1.targetinstall: $(xorg-font-bitstream-type1_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-bitstream-type1)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_BITSTREAM_TYPE1_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-bitstream-type1)
+	@$(call install_fixup, xorg-font-bitstream-type1,PACKAGE,xorg-font-bitstream-type1)
+	@$(call install_fixup, xorg-font-bitstream-type1,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-bitstream-type1,VERSION,$(XORG_FONT_BITSTREAM_TYPE1_VERSION))
+	@$(call install_fixup, xorg-font-bitstream-type1,SECTION,base)
+	@$(call install_fixup, xorg-font-bitstream-type1,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-bitstream-type1,DEPENDS,)
+	@$(call install_fixup, xorg-font-bitstream-type1,DESCRIPTION,missing)
 
 	@cd $(XORG_FONT_BITSTREAM_TYPE1_DIR); \
 	for file in *.afm *.pfb; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/Type1/$$file, n); \
+		$(call install_copy, xorg-font-bitstream-type1, 0, 0, 0644, $$file, $(XORG_FONTDIR)/Type1/$$file, n); \
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-bitstream-type1)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-cronyx-cyrillic.make b/rules/xorg-font-cronyx-cyrillic.make
index ea5b715a6..c9276c28e 100644
--- a/rules/xorg-font-cronyx-cyrillic.make
+++ b/rules/xorg-font-cronyx-cyrillic.make
@@ -106,21 +106,21 @@ xorg-font-cronyx-cyrillic_targetinstall: $(STATEDIR)/xorg-font-cronyx-cyrillic.t
 $(STATEDIR)/xorg-font-cronyx-cyrillic.targetinstall: $(xorg-font-cronyx-cyrillic_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-cronyx-cyrillic)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_CRONYX_CYRILLIC_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-cronyx-cyrillic)
+	@$(call install_fixup, xorg-font-cronyx-cyrillic,PACKAGE,xorg-font-cronyx-cyrillic)
+	@$(call install_fixup, xorg-font-cronyx-cyrillic,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-cronyx-cyrillic,VERSION,$(XORG_FONT_CRONYX_CYRILLIC_VERSION))
+	@$(call install_fixup, xorg-font-cronyx-cyrillic,SECTION,base)
+	@$(call install_fixup, xorg-font-cronyx-cyrillic,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-cronyx-cyrillic,DEPENDS,)
+	@$(call install_fixup, xorg-font-cronyx-cyrillic,DESCRIPTION,missing)
 
 	@cd $(XORG_FONT_CRONYX_CYRILLIC_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/cyrillic/$$file, n); \
+		$(call install_copy, xorg-font-cronyx-cyrillic, 0, 0, 0644, $$file, $(XORG_FONTDIR)/cyrillic/$$file, n); \
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-cronyx-cyrillic)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-cursor-misc.make b/rules/xorg-font-cursor-misc.make
index 3bcbfa5e5..86896a1bc 100644
--- a/rules/xorg-font-cursor-misc.make
+++ b/rules/xorg-font-cursor-misc.make
@@ -106,21 +106,21 @@ xorg-font-cursor-misc_targetinstall: $(STATEDIR)/xorg-font-cursor-misc.targetins
 $(STATEDIR)/xorg-font-cursor-misc.targetinstall: $(xorg-font-cursor-misc_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-cursor-misc)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_CURSOR_MISC_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-cursor-misc)
+	@$(call install_fixup, xorg-font-cursor-misc,PACKAGE,xorg-font-cursor-misc)
+	@$(call install_fixup, xorg-font-cursor-misc,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-cursor-misc,VERSION,$(XORG_FONT_CURSOR_MISC_VERSION))
+	@$(call install_fixup, xorg-font-cursor-misc,SECTION,base)
+	@$(call install_fixup, xorg-font-cursor-misc,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-cursor-misc,DEPENDS,)
+	@$(call install_fixup, xorg-font-cursor-misc,DESCRIPTION,missing)
 
 	@cd $(XORG_FONT_CURSOR_MISC_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
+		$(call install_copy, xorg-font-cursor-misc, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-cursor-misc)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-daewoo-misc.make b/rules/xorg-font-daewoo-misc.make
index 37c837580..78c69d469 100644
--- a/rules/xorg-font-daewoo-misc.make
+++ b/rules/xorg-font-daewoo-misc.make
@@ -106,21 +106,21 @@ xorg-font-daewoo-misc_targetinstall: $(STATEDIR)/xorg-font-daewoo-misc.targetins
 $(STATEDIR)/xorg-font-daewoo-misc.targetinstall: $(xorg-font-daewoo-misc_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-daewoo-misc)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_DAEWOO_MISC_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-daewoo-misc)
+	@$(call install_fixup, xorg-font-daewoo-misc,PACKAGE,xorg-font-daewoo-misc)
+	@$(call install_fixup, xorg-font-daewoo-misc,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-daewoo-misc,VERSION,$(XORG_FONT_DAEWOO_MISC_VERSION))
+	@$(call install_fixup, xorg-font-daewoo-misc,SECTION,base)
+	@$(call install_fixup, xorg-font-daewoo-misc,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-daewoo-misc,DEPENDS,)
+	@$(call install_fixup, xorg-font-daewoo-misc,DESCRIPTION,missing)
 
 	@cd $(XORG_FONT_DAEWOO_MISC_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
+		$(call install_copy, xorg-font-daewoo-misc, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-daewoo-misc)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-dec-misc.make b/rules/xorg-font-dec-misc.make
index 15e466f1d..917d39d05 100644
--- a/rules/xorg-font-dec-misc.make
+++ b/rules/xorg-font-dec-misc.make
@@ -106,21 +106,21 @@ xorg-font-dec-misc_targetinstall: $(STATEDIR)/xorg-font-dec-misc.targetinstall
 $(STATEDIR)/xorg-font-dec-misc.targetinstall: $(xorg-font-dec-misc_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-dec-misc)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_DEC_MISC_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-dec-misc)
+	@$(call install_fixup, xorg-font-dec-misc,PACKAGE,xorg-font-dec-misc)
+	@$(call install_fixup, xorg-font-dec-misc,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-dec-misc,VERSION,$(XORG_FONT_DEC_MISC_VERSION))
+	@$(call install_fixup, xorg-font-dec-misc,SECTION,base)
+	@$(call install_fixup, xorg-font-dec-misc,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-dec-misc,DEPENDS,)
+	@$(call install_fixup, xorg-font-dec-misc,DESCRIPTION,missing)
 
 	@cd $(XORG_FONT_DEC_MISC_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
+		$(call install_copy, xorg-font-dec-misc, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-dec-misc)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-encodings.make b/rules/xorg-font-encodings.make
index 3ad4f8052..5a78604c0 100644
--- a/rules/xorg-font-encodings.make
+++ b/rules/xorg-font-encodings.make
@@ -106,18 +106,18 @@ xorg-font-encodings_targetinstall: $(STATEDIR)/xorg-font-encodings.targetinstall
 $(STATEDIR)/xorg-font-encodings.targetinstall: $(xorg-font-encodings_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-encodings)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_ENCODINGS_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-encodings)
+	@$(call install_fixup, xorg-font-encodings,PACKAGE,xorg-font-encodings)
+	@$(call install_fixup, xorg-font-encodings,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-encodings,VERSION,$(XORG_FONT_ENCODINGS_VERSION))
+	@$(call install_fixup, xorg-font-encodings,SECTION,base)
+	@$(call install_fixup, xorg-font-encodings,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-encodings,DEPENDS,)
+	@$(call install_fixup, xorg-font-encodings,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-encodings)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-ibm-type1.make b/rules/xorg-font-ibm-type1.make
index 150f15f59..0f449e1e5 100644
--- a/rules/xorg-font-ibm-type1.make
+++ b/rules/xorg-font-ibm-type1.make
@@ -106,21 +106,21 @@ xorg-font-ibm-type1_targetinstall: $(STATEDIR)/xorg-font-ibm-type1.targetinstall
 $(STATEDIR)/xorg-font-ibm-type1.targetinstall: $(xorg-font-ibm-type1_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-ibm-type1)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_IBM_TYPE1_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-ibm-type1)
+	@$(call install_fixup, xorg-font-ibm-type1,PACKAGE,xorg-font-ibm-type1)
+	@$(call install_fixup, xorg-font-ibm-type1,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-ibm-type1,VERSION,$(XORG_FONT_IBM_TYPE1_VERSION))
+	@$(call install_fixup, xorg-font-ibm-type1,SECTION,base)
+	@$(call install_fixup, xorg-font-ibm-type1,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-ibm-type1,DEPENDS,)
+	@$(call install_fixup, xorg-font-ibm-type1,DESCRIPTION,missing)
 
 	@cd $(XORG_FONT_IBM_TYPE1_DIR); \
 	for file in *.pfa *.afm; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/Type1/$$file, n); \
+		$(call install_copy, xorg-font-ibm-type1, 0, 0, 0644, $$file, $(XORG_FONTDIR)/Type1/$$file, n); \
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-ibm-type1)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-isas-misc.make b/rules/xorg-font-isas-misc.make
index 13e715ccc..b3b6e32cc 100644
--- a/rules/xorg-font-isas-misc.make
+++ b/rules/xorg-font-isas-misc.make
@@ -106,21 +106,21 @@ xorg-font-isas-misc_targetinstall: $(STATEDIR)/xorg-font-isas-misc.targetinstall
 $(STATEDIR)/xorg-font-isas-misc.targetinstall: $(xorg-font-isas-misc_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-isas-misc)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_ISAS_MISC_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-isas-misc)
+	@$(call install_fixup, xorg-font-isas-misc,PACKAGE,xorg-font-isas-misc)
+	@$(call install_fixup, xorg-font-isas-misc,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-isas-misc,VERSION,$(XORG_FONT_ISAS_MISC_VERSION))
+	@$(call install_fixup, xorg-font-isas-misc,SECTION,base)
+	@$(call install_fixup, xorg-font-isas-misc,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-isas-misc,DEPENDS,)
+	@$(call install_fixup, xorg-font-isas-misc,DESCRIPTION,missing)
 
 	@cd $(XORG_FONT_ISAS_MISC_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
+		$(call install_copy, xorg-font-isas-misc, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-isas-misc)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-jis-misc.make b/rules/xorg-font-jis-misc.make
index 79fb83f72..d04992bfd 100644
--- a/rules/xorg-font-jis-misc.make
+++ b/rules/xorg-font-jis-misc.make
@@ -106,21 +106,21 @@ xorg-font-jis-misc_targetinstall: $(STATEDIR)/xorg-font-jis-misc.targetinstall
 $(STATEDIR)/xorg-font-jis-misc.targetinstall: $(xorg-font-jis-misc_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-jis-misc)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_JIS_MISC_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-jis-misc)
+	@$(call install_fixup, xorg-font-jis-misc,PACKAGE,xorg-font-jis-misc)
+	@$(call install_fixup, xorg-font-jis-misc,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-jis-misc,VERSION,$(XORG_FONT_JIS_MISC_VERSION))
+	@$(call install_fixup, xorg-font-jis-misc,SECTION,base)
+	@$(call install_fixup, xorg-font-jis-misc,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-jis-misc,DEPENDS,)
+	@$(call install_fixup, xorg-font-jis-misc,DESCRIPTION,missing)
 
 	@cd $(XORG_FONT_JIS_MISC_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
+		$(call install_copy, xorg-font-jis-misc, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-jis-misc)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-micro-misc.make b/rules/xorg-font-micro-misc.make
index d0b254a17..df7f962cf 100644
--- a/rules/xorg-font-micro-misc.make
+++ b/rules/xorg-font-micro-misc.make
@@ -106,21 +106,21 @@ xorg-font-micro-misc_targetinstall: $(STATEDIR)/xorg-font-micro-misc.targetinsta
 $(STATEDIR)/xorg-font-micro-misc.targetinstall: $(xorg-font-micro-misc_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-micro-misc)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_MICRO_MISC_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-micro-misc)
+	@$(call install_fixup, xorg-font-micro-misc,PACKAGE,xorg-font-micro-misc)
+	@$(call install_fixup, xorg-font-micro-misc,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-micro-misc,VERSION,$(XORG_FONT_MICRO_MISC_VERSION))
+	@$(call install_fixup, xorg-font-micro-misc,SECTION,base)
+	@$(call install_fixup, xorg-font-micro-misc,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-micro-misc,DEPENDS,)
+	@$(call install_fixup, xorg-font-micro-misc,DESCRIPTION,missing)
 
 	@cd $(XORG_FONT_MICRO_MISC_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
+		$(call install_copy, xorg-font-micro-misc, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-micro-misc)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-misc-cyrillic.make b/rules/xorg-font-misc-cyrillic.make
index bd4160948..fad6fbbf0 100644
--- a/rules/xorg-font-misc-cyrillic.make
+++ b/rules/xorg-font-misc-cyrillic.make
@@ -106,21 +106,21 @@ xorg-font-misc-cyrillic_targetinstall: $(STATEDIR)/xorg-font-misc-cyrillic.targe
 $(STATEDIR)/xorg-font-misc-cyrillic.targetinstall: $(xorg-font-misc-cyrillic_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-misc-cyrillic)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_MISC_CYRILLIC_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-misc-cyrillic)
+	@$(call install_fixup, xorg-font-misc-cyrillic,PACKAGE,xorg-font-misc-cyrillic)
+	@$(call install_fixup, xorg-font-misc-cyrillic,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-misc-cyrillic,VERSION,$(XORG_FONT_MISC_CYRILLIC_VERSION))
+	@$(call install_fixup, xorg-font-misc-cyrillic,SECTION,base)
+	@$(call install_fixup, xorg-font-misc-cyrillic,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-misc-cyrillic,DEPENDS,)
+	@$(call install_fixup, xorg-font-misc-cyrillic,DESCRIPTION,missing)
 
 	@cd $(XORG_FONT_MISC_CYRILLIC_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/cyrillic/$$file, n); \
+		$(call install_copy, xorg-font-misc-cyrillic, 0, 0, 0644, $$file, $(XORG_FONTDIR)/cyrillic/$$file, n); \
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-misc-cyrillic)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-misc-ethiopic.make b/rules/xorg-font-misc-ethiopic.make
index 68d14108a..50d200f5a 100644
--- a/rules/xorg-font-misc-ethiopic.make
+++ b/rules/xorg-font-misc-ethiopic.make
@@ -106,21 +106,21 @@ xorg-font-misc-ethiopic_targetinstall: $(STATEDIR)/xorg-font-misc-ethiopic.targe
 $(STATEDIR)/xorg-font-misc-ethiopic.targetinstall: $(xorg-font-misc-ethiopic_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-misc-ethiopic)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_MISC_ETHIOPIC_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-misc-ethiopic)
+	@$(call install_fixup, xorg-font-misc-ethiopic,PACKAGE,xorg-font-misc-ethiopic)
+	@$(call install_fixup, xorg-font-misc-ethiopic,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-misc-ethiopic,VERSION,$(XORG_FONT_MISC_ETHIOPIC_VERSION))
+	@$(call install_fixup, xorg-font-misc-ethiopic,SECTION,base)
+	@$(call install_fixup, xorg-font-misc-ethiopic,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-misc-ethiopic,DEPENDS,)
+	@$(call install_fixup, xorg-font-misc-ethiopic,DESCRIPTION,missing)
 
 	@cd $(XORG_FONT_MISC_ETHIOPIC_DIR); \
 	for file in *.otf *.ttf; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
+		$(call install_copy, xorg-font-misc-ethiopic, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-misc-ethiopic)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-misc-meltho.make b/rules/xorg-font-misc-meltho.make
index 92d94840e..673332df2 100644
--- a/rules/xorg-font-misc-meltho.make
+++ b/rules/xorg-font-misc-meltho.make
@@ -106,21 +106,21 @@ xorg-font-misc-meltho_targetinstall: $(STATEDIR)/xorg-font-misc-meltho.targetins
 $(STATEDIR)/xorg-font-misc-meltho.targetinstall: $(xorg-font-misc-meltho_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-misc-meltho)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_MISC_MELTHO_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-misc-meltho)
+	@$(call install_fixup, xorg-font-misc-meltho,PACKAGE,xorg-font-misc-meltho)
+	@$(call install_fixup, xorg-font-misc-meltho,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-misc-meltho,VERSION,$(XORG_FONT_MISC_MELTHO_VERSION))
+	@$(call install_fixup, xorg-font-misc-meltho,SECTION,base)
+	@$(call install_fixup, xorg-font-misc-meltho,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-misc-meltho,DEPENDS,)
+	@$(call install_fixup, xorg-font-misc-meltho,DESCRIPTION,missing)
 
 	@cd $(XORG_FONT_MISC_MELTHO_DIR); \
 	for file in *.otf; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
+		$(call install_copy, xorg-font-misc-meltho, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-misc-meltho)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-misc-misc.make b/rules/xorg-font-misc-misc.make
index b36ed514c..725b2f56c 100644
--- a/rules/xorg-font-misc-misc.make
+++ b/rules/xorg-font-misc-misc.make
@@ -106,21 +106,21 @@ xorg-font-misc-misc_targetinstall: $(STATEDIR)/xorg-font-misc-misc.targetinstall
 $(STATEDIR)/xorg-font-misc-misc.targetinstall: $(xorg-font-misc-misc_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-misc-misc)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_MISC_MISC_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-misc-misc)
+	@$(call install_fixup, xorg-font-misc-misc,PACKAGE,xorg-font-misc-misc)
+	@$(call install_fixup, xorg-font-misc-misc,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-misc-misc,VERSION,$(XORG_FONT_MISC_MISC_VERSION))
+	@$(call install_fixup, xorg-font-misc-misc,SECTION,base)
+	@$(call install_fixup, xorg-font-misc-misc,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-misc-misc,DEPENDS,)
+	@$(call install_fixup, xorg-font-misc-misc,DESCRIPTION,missing)
 
 	@cd $(XORG_FONT_MISC_MISC_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
+		$(call install_copy, xorg-font-misc-misc, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-misc-misc)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-mutt-misc.make b/rules/xorg-font-mutt-misc.make
index d9fcbc808..78053a95c 100644
--- a/rules/xorg-font-mutt-misc.make
+++ b/rules/xorg-font-mutt-misc.make
@@ -106,21 +106,21 @@ xorg-font-mutt-misc_targetinstall: $(STATEDIR)/xorg-font-mutt-misc.targetinstall
 $(STATEDIR)/xorg-font-mutt-misc.targetinstall: $(xorg-font-mutt-misc_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-mutt-misc)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_MUTT_MISC_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-mutt-misc)
+	@$(call install_fixup, xorg-font-mutt-misc,PACKAGE,xorg-font-mutt-misc)
+	@$(call install_fixup, xorg-font-mutt-misc,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-mutt-misc,VERSION,$(XORG_FONT_MUTT_MISC_VERSION))
+	@$(call install_fixup, xorg-font-mutt-misc,SECTION,base)
+	@$(call install_fixup, xorg-font-mutt-misc,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-mutt-misc,DEPENDS,)
+	@$(call install_fixup, xorg-font-mutt-misc,DESCRIPTION,missing)
 
 	@cd $(XORG_FONT_MUTT_MISC_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
+		$(call install_copy, xorg-font-mutt-misc, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-mutt-misc)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-schumacher-misc.make b/rules/xorg-font-schumacher-misc.make
index 567b9a102..3b7effa81 100644
--- a/rules/xorg-font-schumacher-misc.make
+++ b/rules/xorg-font-schumacher-misc.make
@@ -106,21 +106,21 @@ xorg-font-schumacher-misc_targetinstall: $(STATEDIR)/xorg-font-schumacher-misc.t
 $(STATEDIR)/xorg-font-schumacher-misc.targetinstall: $(xorg-font-schumacher-misc_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-schumacher-misc)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_SCHUMACHER_MISC_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-schumacher-misc)
+	@$(call install_fixup, xorg-font-schumacher-misc,PACKAGE,xorg-font-schumacher-misc)
+	@$(call install_fixup, xorg-font-schumacher-misc,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-schumacher-misc,VERSION,$(XORG_FONT_SCHUMACHER_MISC_VERSION))
+	@$(call install_fixup, xorg-font-schumacher-misc,SECTION,base)
+	@$(call install_fixup, xorg-font-schumacher-misc,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-schumacher-misc,DEPENDS,)
+	@$(call install_fixup, xorg-font-schumacher-misc,DESCRIPTION,missing)
 
 	@cd $(XORG_FONT_SCHUMACHER_MISC_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
+		$(call install_copy, xorg-font-schumacher-misc, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-schumacher-misc)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-screen-cyrillic.make b/rules/xorg-font-screen-cyrillic.make
index 6f297ddb8..8f844a5c3 100644
--- a/rules/xorg-font-screen-cyrillic.make
+++ b/rules/xorg-font-screen-cyrillic.make
@@ -106,21 +106,21 @@ xorg-font-screen-cyrillic_targetinstall: $(STATEDIR)/xorg-font-screen-cyrillic.t
 $(STATEDIR)/xorg-font-screen-cyrillic.targetinstall: $(xorg-font-screen-cyrillic_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-screen-cyrillic)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_SCREEN_CYRILLIC_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-screen-cyrillic)
+	@$(call install_fixup, xorg-font-screen-cyrillic,PACKAGE,xorg-font-screen-cyrillic)
+	@$(call install_fixup, xorg-font-screen-cyrillic,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-screen-cyrillic,VERSION,$(XORG_FONT_SCREEN_CYRILLIC_VERSION))
+	@$(call install_fixup, xorg-font-screen-cyrillic,SECTION,base)
+	@$(call install_fixup, xorg-font-screen-cyrillic,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-screen-cyrillic,DEPENDS,)
+	@$(call install_fixup, xorg-font-screen-cyrillic,DESCRIPTION,missing)
 
 	@cd $(XORG_FONT_SCREEN_CYRILLIC_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/cyrillic/$$file, n); \
+		$(call install_copy, xorg-font-screen-cyrillic, 0, 0, 0644, $$file, $(XORG_FONTDIR)/cyrillic/$$file, n); \
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-screen-cyrillic)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-sony-misc.make b/rules/xorg-font-sony-misc.make
index d4b726a1b..529287c6c 100644
--- a/rules/xorg-font-sony-misc.make
+++ b/rules/xorg-font-sony-misc.make
@@ -106,21 +106,21 @@ xorg-font-sony-misc_targetinstall: $(STATEDIR)/xorg-font-sony-misc.targetinstall
 $(STATEDIR)/xorg-font-sony-misc.targetinstall: $(xorg-font-sony-misc_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-sony-misc)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_SONY_MISC_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-sony-misc)
+	@$(call install_fixup, xorg-font-sony-misc,PACKAGE,xorg-font-sony-misc)
+	@$(call install_fixup, xorg-font-sony-misc,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-sony-misc,VERSION,$(XORG_FONT_SONY_MISC_VERSION))
+	@$(call install_fixup, xorg-font-sony-misc,SECTION,base)
+	@$(call install_fixup, xorg-font-sony-misc,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-sony-misc,DEPENDS,)
+	@$(call install_fixup, xorg-font-sony-misc,DESCRIPTION,missing)
 
 	@cd $(XORG_FONT_SONY_MISC_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
+		$(call install_copy, xorg-font-sony-misc, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-sony-misc)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-sun-misc.make b/rules/xorg-font-sun-misc.make
index 641fbdc03..669ef68ee 100644
--- a/rules/xorg-font-sun-misc.make
+++ b/rules/xorg-font-sun-misc.make
@@ -106,21 +106,21 @@ xorg-font-sun-misc_targetinstall: $(STATEDIR)/xorg-font-sun-misc.targetinstall
 $(STATEDIR)/xorg-font-sun-misc.targetinstall: $(xorg-font-sun-misc_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-sun-misc)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_SUN_MISC_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-sun-misc)
+	@$(call install_fixup, xorg-font-sun-misc,PACKAGE,xorg-font-sun-misc)
+	@$(call install_fixup, xorg-font-sun-misc,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-sun-misc,VERSION,$(XORG_FONT_SUN_MISC_VERSION))
+	@$(call install_fixup, xorg-font-sun-misc,SECTION,base)
+	@$(call install_fixup, xorg-font-sun-misc,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-sun-misc,DEPENDS,)
+	@$(call install_fixup, xorg-font-sun-misc,DESCRIPTION,missing)
 
 	@cd $(XORG_FONT_SUN_MISC_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
+		$(call install_copy, xorg-font-sun-misc, 0, 0, 0644, $$file, $(XORG_FONTDIR)/misc/$$file, n); \
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-sun-misc)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-util.make b/rules/xorg-font-util.make
index 2070b6894..c2cbbadf9 100644
--- a/rules/xorg-font-util.make
+++ b/rules/xorg-font-util.make
@@ -106,18 +106,18 @@ xorg-font-util_targetinstall: $(STATEDIR)/xorg-font-util.targetinstall
 $(STATEDIR)/xorg-font-util.targetinstall: $(xorg-font-util_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-util)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_UTIL_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-util)
+	@$(call install_fixup, xorg-font-util,PACKAGE,xorg-font-util)
+	@$(call install_fixup, xorg-font-util,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-util,VERSION,$(XORG_FONT_UTIL_VERSION))
+	@$(call install_fixup, xorg-font-util,SECTION,base)
+	@$(call install_fixup, xorg-font-util,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-util,DEPENDS,)
+	@$(call install_fixup, xorg-font-util,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-util)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-winitzki-cyrillic.make b/rules/xorg-font-winitzki-cyrillic.make
index 57da25322..49711239d 100644
--- a/rules/xorg-font-winitzki-cyrillic.make
+++ b/rules/xorg-font-winitzki-cyrillic.make
@@ -106,21 +106,21 @@ xorg-font-winitzki-cyrillic_targetinstall: $(STATEDIR)/xorg-font-winitzki-cyrill
 $(STATEDIR)/xorg-font-winitzki-cyrillic.targetinstall: $(xorg-font-winitzki-cyrillic_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-winitzki-cyrillic)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_WINITZKI_CYRILLIC_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-winitzki-cyrillic)
+	@$(call install_fixup, xorg-font-winitzki-cyrillic,PACKAGE,xorg-font-winitzki-cyrillic)
+	@$(call install_fixup, xorg-font-winitzki-cyrillic,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-winitzki-cyrillic,VERSION,$(XORG_FONT_WINITZKI_CYRILLIC_VERSION))
+	@$(call install_fixup, xorg-font-winitzki-cyrillic,SECTION,base)
+	@$(call install_fixup, xorg-font-winitzki-cyrillic,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-winitzki-cyrillic,DEPENDS,)
+	@$(call install_fixup, xorg-font-winitzki-cyrillic,DESCRIPTION,missing)
 
 	@cd $(XORG_FONT_WINITZKI_CYRILLIC_DIR); \
 	for file in *.pcf.gz; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/cyrillic/$$file, n); \
+		$(call install_copy, xorg-font-winitzki-cyrillic, 0, 0, 0644, $$file, $(XORG_FONTDIR)/cyrillic/$$file, n); \
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-winitzki-cyrillic)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-font-xfree86-type1.make b/rules/xorg-font-xfree86-type1.make
index 08fe9896c..4b677a91e 100644
--- a/rules/xorg-font-xfree86-type1.make
+++ b/rules/xorg-font-xfree86-type1.make
@@ -106,21 +106,21 @@ xorg-font-xfree86-type1_targetinstall: $(STATEDIR)/xorg-font-xfree86-type1.targe
 $(STATEDIR)/xorg-font-xfree86-type1.targetinstall: $(xorg-font-xfree86-type1_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-font-xfree86-type1)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_FONT_XFREE86_TYPE1_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-font-xfree86-type1)
+	@$(call install_fixup, xorg-font-xfree86-type1,PACKAGE,xorg-font-xfree86-type1)
+	@$(call install_fixup, xorg-font-xfree86-type1,PRIORITY,optional)
+	@$(call install_fixup, xorg-font-xfree86-type1,VERSION,$(XORG_FONT_XFREE86_TYPE1_VERSION))
+	@$(call install_fixup, xorg-font-xfree86-type1,SECTION,base)
+	@$(call install_fixup, xorg-font-xfree86-type1,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-font-xfree86-type1,DEPENDS,)
+	@$(call install_fixup, xorg-font-xfree86-type1,DESCRIPTION,missing)
 
 	@cd $(XORG_FONT_XFREE86_TYPE1_DIR); \
 	for file in *.pfa; do	\
-		$(call install_copy, 0, 0, 0644, $$file, $(XORG_FONTDIR)/Type1/$$file, n); \
+		$(call install_copy, xorg-font-xfree86-type1, 0, 0, 0644, $$file, $(XORG_FONTDIR)/Type1/$$file, n); \
 	done
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-font-xfree86-type1)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-AppleWM.make b/rules/xorg-lib-AppleWM.make
index 167f3b5df..6cbf2acb4 100644
--- a/rules/xorg-lib-AppleWM.make
+++ b/rules/xorg-lib-AppleWM.make
@@ -108,18 +108,18 @@ xorg-lib-AppleWM_targetinstall: $(STATEDIR)/xorg-lib-AppleWM.targetinstall
 $(STATEDIR)/xorg-lib-AppleWM.targetinstall: $(xorg-lib-AppleWM_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-AppleWM)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_APPLEWM_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-AppleWM)
+	@$(call install_fixup, xorg-lib-AppleWM,PACKAGE,xorg-lib-AppleWM)
+	@$(call install_fixup, xorg-lib-AppleWM,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-AppleWM,VERSION,$(XORG_LIB_APPLEWM_VERSION))
+	@$(call install_fixup, xorg-lib-AppleWM,SECTION,base)
+	@$(call install_fixup, xorg-lib-AppleWM,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-AppleWM,DEPENDS,)
+	@$(call install_fixup, xorg-lib-AppleWM,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-AppleWM)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-FS.make b/rules/xorg-lib-FS.make
index 0dedbc186..1ea123851 100644
--- a/rules/xorg-lib-FS.make
+++ b/rules/xorg-lib-FS.make
@@ -106,18 +106,18 @@ xorg-lib-FS_targetinstall: $(STATEDIR)/xorg-lib-FS.targetinstall
 $(STATEDIR)/xorg-lib-FS.targetinstall: $(xorg-lib-FS_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-fs)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_FS_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-FS)
+	@$(call install_fixup, xorg-lib-FS,PACKAGE,xorg-lib-fs)
+	@$(call install_fixup, xorg-lib-FS,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-FS,VERSION,$(XORG_LIB_FS_VERSION))
+	@$(call install_fixup, xorg-lib-FS,SECTION,base)
+	@$(call install_fixup, xorg-lib-FS,AUTHOR,"Erwin rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-FS,DEPENDS,)
+	@$(call install_fixup, xorg-lib-FS,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-FS)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-ICE.make b/rules/xorg-lib-ICE.make
index a7616688f..e781fdc37 100644
--- a/rules/xorg-lib-ICE.make
+++ b/rules/xorg-lib-ICE.make
@@ -106,28 +106,28 @@ xorg-lib-ICE_targetinstall: $(STATEDIR)/xorg-lib-ICE.targetinstall
 $(STATEDIR)/xorg-lib-ICE.targetinstall: $(xorg-lib-ICE_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-ice)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_ICE_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_init, xorg-lib-ICE)
+	@$(call install_fixup, xorg-lib-ICE,PACKAGE,xorg-lib-ice)
+	@$(call install_fixup, xorg-lib-ICE,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-ICE,VERSION,$(XORG_LIB_ICE_VERSION))
+	@$(call install_fixup, xorg-lib-ICE,SECTION,base)
+	@$(call install_fixup, xorg-lib-ICE,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-ICE,DEPENDS,)
+	@$(call install_fixup, xorg-lib-ICE,DESCRIPTION,missing)
+
+	@$(call install_copy, xorg-lib-ICE, 0, 0, 0644, \
 		$(XORG_LIB_ICE_DIR)/src/.libs/libICE.so.6.3.0, \
 		$(XORG_LIBDIR)/libICE.so.6.3.0)
 
-	@$(call install_link, \
+	@$(call install_link, xorg-lib-ICE, \
 		libICE.so.6.3.0, \
 		$(XORG_LIBDIR)/libICE.so.6)
 
-	@$(call install_link, \
+	@$(call install_link, xorg-lib-ICE, \
 		libICE.so.6.3.0, \
 		$(XORG_LIBDIR)/libICE.so)
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-ICE)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-SM.make b/rules/xorg-lib-SM.make
index 890ea32e3..b367de68b 100644
--- a/rules/xorg-lib-SM.make
+++ b/rules/xorg-lib-SM.make
@@ -106,28 +106,28 @@ xorg-lib-SM_targetinstall: $(STATEDIR)/xorg-lib-SM.targetinstall
 $(STATEDIR)/xorg-lib-SM.targetinstall: $(xorg-lib-SM_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-sm)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_SM_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_init, xorg-lib-SM)
+	@$(call install_fixup, xorg-lib-SM,PACKAGE,xorg-lib-sm)
+	@$(call install_fixup, xorg-lib-SM,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-SM,VERSION,$(XORG_LIB_SM_VERSION))
+	@$(call install_fixup, xorg-lib-SM,SECTION,base)
+	@$(call install_fixup, xorg-lib-SM,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-SM,DEPENDS,)
+	@$(call install_fixup, xorg-lib-SM,DESCRIPTION,missing)
+
+	@$(call install_copy, xorg-lib-SM, 0, 0, 0644, \
 		$(XORG_LIB_SM_DIR)/src/.libs/libSM.so.6.0.0, \
 		$(XORG_LIBDIR)/libSM.so.6.0.0)
 
-	@$(call install_link, \
+	@$(call install_link, xorg-lib-SM, \
 		libSM.so.6.0.0, \
 		$(XORG_LIBDIR)/libSM.so.6)
 
-	@$(call install_link, \
+	@$(call install_link, xorg-lib-SM, \
 		libSM.so.6.0.0, \
 		$(XORG_LIBDIR)/libSM.so)
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-SM)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-WindowsWM.make b/rules/xorg-lib-WindowsWM.make
index ace7515ef..51df5c45c 100644
--- a/rules/xorg-lib-WindowsWM.make
+++ b/rules/xorg-lib-WindowsWM.make
@@ -106,18 +106,18 @@ xorg-lib-WindowsWM_targetinstall: $(STATEDIR)/xorg-lib-WindowsWM.targetinstall
 $(STATEDIR)/xorg-lib-WindowsWM.targetinstall: $(xorg-lib-WindowsWM_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-windowswm)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_WINDOWSWM_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-WindowsWM)
+	@$(call install_fixup, xorg-lib-WindowsWM,PACKAGE,xorg-lib-windowswm)
+	@$(call install_fixup, xorg-lib-WindowsWM,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-WindowsWM,VERSION,$(XORG_LIB_WINDOWSWM_VERSION))
+	@$(call install_fixup, xorg-lib-WindowsWM,SECTION,base)
+	@$(call install_fixup, xorg-lib-WindowsWM,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-WindowsWM,DEPENDS,)
+	@$(call install_fixup, xorg-lib-WindowsWM,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-WindowsWM)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-X11.make b/rules/xorg-lib-X11.make
index c0d5e2f28..bb95f5e9a 100644
--- a/rules/xorg-lib-X11.make
+++ b/rules/xorg-lib-X11.make
@@ -108,28 +108,28 @@ xorg-lib-X11_targetinstall: $(STATEDIR)/xorg-lib-X11.targetinstall
 $(STATEDIR)/xorg-lib-X11.targetinstall: $(xorg-lib-X11_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-x11)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_X11_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_init, xorg-lib-X11)
+	@$(call install_fixup, xorg-lib-X11,PACKAGE,xorg-lib-x11)
+	@$(call install_fixup, xorg-lib-X11,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-X11,VERSION,$(XORG_LIB_X11_VERSION))
+	@$(call install_fixup, xorg-lib-X11,SECTION,base)
+	@$(call install_fixup, xorg-lib-X11,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-X11,DEPENDS,)
+	@$(call install_fixup, xorg-lib-X11,DESCRIPTION,missing)
+
+	@$(call install_copy, xorg-lib-X11, 0, 0, 0644, \
 		$(XORG_LIB_X11_DIR)/src/.libs/libX11.so.6.2.0, \
 		$(XORG_LIBDIR)/libX11.so.6.2.0)
 
-	@$(call install_link, \
+	@$(call install_link, xorg-lib-X11, \
 		libX11.so.6.2.0, \
 		$(XORG_LIBDIR)/libX11.so.6)
 
-	@$(call install_link, \
+	@$(call install_link, xorg-lib-X11, \
 		libX11.so.6.2.0, \
 		$(XORG_LIBDIR)/libX11.so)
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-X11)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-XScrnSaver.make b/rules/xorg-lib-XScrnSaver.make
index c713f8131..6155d8d4a 100644
--- a/rules/xorg-lib-XScrnSaver.make
+++ b/rules/xorg-lib-XScrnSaver.make
@@ -106,18 +106,18 @@ xorg-lib-XScrnSaver_targetinstall: $(STATEDIR)/xorg-lib-XScrnSaver.targetinstall
 $(STATEDIR)/xorg-lib-XScrnSaver.targetinstall: $(xorg-lib-XScrnSaver_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xscrnsaver)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XSCRNSAVER_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-XScrnSaver)
+	@$(call install_fixup, xorg-lib-XScrnSaver,PACKAGE,xorg-lib-xscrnsaver)
+	@$(call install_fixup, xorg-lib-XScrnSaver,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-XScrnSaver,VERSION,$(XORG_LIB_XSCRNSAVER_VERSION))
+	@$(call install_fixup, xorg-lib-XScrnSaver,SECTION,base)
+	@$(call install_fixup, xorg-lib-XScrnSaver,AUTHOR,"Erwin rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-XScrnSaver,DEPENDS,)
+	@$(call install_fixup, xorg-lib-XScrnSaver,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-XScrnSaver)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-XTrap.make b/rules/xorg-lib-XTrap.make
index 5ef6b2a5a..d2d8b2a0d 100644
--- a/rules/xorg-lib-XTrap.make
+++ b/rules/xorg-lib-XTrap.make
@@ -106,18 +106,18 @@ xorg-lib-XTrap_targetinstall: $(STATEDIR)/xorg-lib-XTrap.targetinstall
 $(STATEDIR)/xorg-lib-XTrap.targetinstall: $(xorg-lib-XTrap_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xtrap)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XTRAP_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-XTrap)
+	@$(call install_fixup, xorg-lib-XTrap,PACKAGE,xorg-lib-xtrap)
+	@$(call install_fixup, xorg-lib-XTrap,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-XTrap,VERSION,$(XORG_LIB_XTRAP_VERSION))
+	@$(call install_fixup, xorg-lib-XTrap,SECTION,base)
+	@$(call install_fixup, xorg-lib-XTrap,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-XTrap,DEPENDS,)
+	@$(call install_fixup, xorg-lib-XTrap,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-XTrap)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-Xau.make b/rules/xorg-lib-Xau.make
index 3ec0aba4a..9e4bfddd0 100644
--- a/rules/xorg-lib-Xau.make
+++ b/rules/xorg-lib-Xau.make
@@ -106,28 +106,28 @@ xorg-lib-Xau_targetinstall: $(STATEDIR)/xorg-lib-Xau.targetinstall
 $(STATEDIR)/xorg-lib-Xau.targetinstall: $(xorg-lib-Xau_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xau)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XAU_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_init, xorg-lib-Xau)
+	@$(call install_fixup, xorg-lib-Xau,PACKAGE,xorg-lib-xau)
+	@$(call install_fixup, xorg-lib-Xau,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-Xau,VERSION,$(XORG_LIB_XAU_VERSION))
+	@$(call install_fixup, xorg-lib-Xau,SECTION,base)
+	@$(call install_fixup, xorg-lib-Xau,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-Xau,DEPENDS,)
+	@$(call install_fixup, xorg-lib-Xau,DESCRIPTION,missing)
+
+	@$(call install_copy, xorg-lib-Xau, 0, 0, 0644, \
 		$(XORG_LIB_XAU_DIR)/.libs/libXau.so.6.0.0, \
 		$(XORG_LIBDIR)/libXau.so.6.0.0)
 
-	@$(call install_link, \
+	@$(call install_link, xorg-lib-Xau, \
 		libXau.so.6.0.0, \
 		$(XORG_LIBDIR)/libXau.so.6)
 
-	@$(call install_link, \
+	@$(call install_link, xorg-lib-Xau, \
 		libXau.so.6.0.0, \
 		$(XORG_LIBDIR)/libXau.so)
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-Xau)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-Xaw.make b/rules/xorg-lib-Xaw.make
index 48230450b..0b59320a0 100644
--- a/rules/xorg-lib-Xaw.make
+++ b/rules/xorg-lib-Xaw.make
@@ -106,17 +106,17 @@ xorg-lib-Xaw_targetinstall: $(STATEDIR)/xorg-lib-Xaw.targetinstall
 $(STATEDIR)/xorg-lib-Xaw.targetinstall: $(xorg-lib-Xaw_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xaw)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XAW_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-Xaw)
+	@$(call install_fixup, xorg-lib-Xaw,PACKAGE,xorg-lib-xaw)
+	@$(call install_fixup, xorg-lib-Xaw,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-Xaw,VERSION,$(XORG_LIB_XAW_VERSION))
+	@$(call install_fixup, xorg-lib-Xaw,SECTION,base)
+	@$(call install_fixup, xorg-lib-Xaw,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-Xaw,DEPENDS,)
+	@$(call install_fixup, xorg-lib-Xaw,DESCRIPTION,missing)
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-Xaw)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-Xcomposite.make b/rules/xorg-lib-Xcomposite.make
index 3d9bab3c9..9c16d4bed 100644
--- a/rules/xorg-lib-Xcomposite.make
+++ b/rules/xorg-lib-Xcomposite.make
@@ -106,18 +106,18 @@ xorg-lib-Xcomposite_targetinstall: $(STATEDIR)/xorg-lib-Xcomposite.targetinstall
 $(STATEDIR)/xorg-lib-Xcomposite.targetinstall: $(xorg-lib-Xcomposite_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xcomposite)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XCOMPOSITE_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-Xcomposite)
+	@$(call install_fixup, xorg-lib-Xcomposite,PACKAGE,xorg-lib-xcomposite)
+	@$(call install_fixup, xorg-lib-Xcomposite,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-Xcomposite,VERSION,$(XORG_LIB_XCOMPOSITE_VERSION))
+	@$(call install_fixup, xorg-lib-Xcomposite,SECTION,base)
+	@$(call install_fixup, xorg-lib-Xcomposite,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-Xcomposite,DEPENDS,)
+	@$(call install_fixup, xorg-lib-Xcomposite,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-Xcomposite)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-Xcursor.make b/rules/xorg-lib-Xcursor.make
index 9d167e7c8..09e48fbe7 100644
--- a/rules/xorg-lib-Xcursor.make
+++ b/rules/xorg-lib-Xcursor.make
@@ -106,18 +106,18 @@ xorg-lib-Xcursor_targetinstall: $(STATEDIR)/xorg-lib-Xcursor.targetinstall
 $(STATEDIR)/xorg-lib-Xcursor.targetinstall: $(xorg-lib-Xcursor_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xcursor)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XCURSOR_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-Xcursor)
+	@$(call install_fixup, xorg-lib-Xcursor,PACKAGE,xorg-lib-xcursor)
+	@$(call install_fixup, xorg-lib-Xcursor,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-Xcursor,VERSION,$(XORG_LIB_XCURSOR_VERSION))
+	@$(call install_fixup, xorg-lib-Xcursor,SECTION,base)
+	@$(call install_fixup, xorg-lib-Xcursor,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-Xcursor,DEPENDS,)
+	@$(call install_fixup, xorg-lib-Xcursor,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-Xcursor)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-Xdamage.make b/rules/xorg-lib-Xdamage.make
index d577d7330..35b77f6e9 100644
--- a/rules/xorg-lib-Xdamage.make
+++ b/rules/xorg-lib-Xdamage.make
@@ -106,18 +106,18 @@ xorg-lib-Xdamage_targetinstall: $(STATEDIR)/xorg-lib-Xdamage.targetinstall
 $(STATEDIR)/xorg-lib-Xdamage.targetinstall: $(xorg-lib-Xdamage_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xdamage)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XDAMAGE_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-Xdamage)
+	@$(call install_fixup, xorg-lib-Xdamage,PACKAGE,xorg-lib-xdamage)
+	@$(call install_fixup, xorg-lib-Xdamage,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-Xdamage,VERSION,$(XORG_LIB_XDAMAGE_VERSION))
+	@$(call install_fixup, xorg-lib-Xdamage,SECTION,base)
+	@$(call install_fixup, xorg-lib-Xdamage,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-Xdamage,DEPENDS,)
+	@$(call install_fixup, xorg-lib-Xdamage,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-Xdamage)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-Xdmcp.make b/rules/xorg-lib-Xdmcp.make
index e641cf773..82bfc22ad 100644
--- a/rules/xorg-lib-Xdmcp.make
+++ b/rules/xorg-lib-Xdmcp.make
@@ -106,28 +106,28 @@ xorg-lib-Xdmcp_targetinstall: $(STATEDIR)/xorg-lib-Xdmcp.targetinstall
 $(STATEDIR)/xorg-lib-Xdmcp.targetinstall: $(xorg-lib-Xdmcp_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xdmcp)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XDMCP_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_init, xorg-lib-Xdmcp)
+	@$(call install_fixup, xorg-lib-Xdmcp,PACKAGE,xorg-lib-xdmcp)
+	@$(call install_fixup, xorg-lib-Xdmcp,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-Xdmcp,VERSION,$(XORG_LIB_XDMCP_VERSION))
+	@$(call install_fixup, xorg-lib-Xdmcp,SECTION,base)
+	@$(call install_fixup, xorg-lib-Xdmcp,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-Xdmcp,DEPENDS,)
+	@$(call install_fixup, xorg-lib-Xdmcp,DESCRIPTION,missing)
+
+	@$(call install_copy, xorg-lib-Xdmcp, 0, 0, 0644, \
 		$(XORG_LIB_XDMCP_DIR)/.libs/libXdmcp.so.6.0.0, \
 		$(XORG_LIBDIR)/libXdmcp.so.6.0.0)
 
-	@$(call install_link, \
+	@$(call install_link, xorg-lib-Xdmcp, \
 		libXdmcp.so.6.0.0, \
 		$(XORG_LIBDIR)/libXdmcp.so.6)
 
-	@$(call install_link, \
+	@$(call install_link, xorg-lib-Xdmcp, \
 		libXdmcp.so.6.0.0, \
 		$(XORG_LIBDIR)/libXdmcp.so)
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-Xdmcp)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-Xevie.make b/rules/xorg-lib-Xevie.make
index 682fee5d5..5c359faac 100644
--- a/rules/xorg-lib-Xevie.make
+++ b/rules/xorg-lib-Xevie.make
@@ -106,18 +106,18 @@ xorg-lib-Xevie_targetinstall: $(STATEDIR)/xorg-lib-Xevie.targetinstall
 $(STATEDIR)/xorg-lib-Xevie.targetinstall: $(xorg-lib-Xevie_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xevie)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XEVIE_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-Xevie)
+	@$(call install_fixup, xorg-lib-Xevie,PACKAGE,xorg-lib-xevie)
+	@$(call install_fixup, xorg-lib-Xevie,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-Xevie,VERSION,$(XORG_LIB_XEVIE_VERSION))
+	@$(call install_fixup, xorg-lib-Xevie,SECTION,base)
+	@$(call install_fixup, xorg-lib-Xevie,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-Xevie,DEPENDS,)
+	@$(call install_fixup, xorg-lib-Xevie,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-Xevie)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-Xext.make b/rules/xorg-lib-Xext.make
index 0b243232a..afd388e42 100644
--- a/rules/xorg-lib-Xext.make
+++ b/rules/xorg-lib-Xext.make
@@ -108,28 +108,28 @@ xorg-lib-Xext_targetinstall: $(STATEDIR)/xorg-lib-Xext.targetinstall
 $(STATEDIR)/xorg-lib-Xext.targetinstall: $(xorg-lib-Xext_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xext)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XEXT_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_init, xorg-lib-Xext)
+	@$(call install_fixup, xorg-lib-Xext,PACKAGE,xorg-lib-xext)
+	@$(call install_fixup, xorg-lib-Xext,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-Xext,VERSION,$(XORG_LIB_XEXT_VERSION))
+	@$(call install_fixup, xorg-lib-Xext,SECTION,base)
+	@$(call install_fixup, xorg-lib-Xext,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-Xext,DEPENDS,)
+	@$(call install_fixup, xorg-lib-Xext,DESCRIPTION,missing)
+
+	@$(call install_copy, xorg-lib-Xext, 0, 0, 0644, \
 		$(XORG_LIB_XEXT_DIR)/src/.libs/libXext.so.6.4.0, \
 		$(XORG_LIBDIR)/libXext.so.6.4.0)
 
-	@$(call install_link, \
+	@$(call install_link, xorg-lib-Xext, \
 		libXext.so.6.4.0, \
 		$(XORG_LIBDIR)/libXext.so.6)
 
-	@$(call install_link, \
+	@$(call install_link, xorg-lib-Xext, \
 		libXext.so.6.4.0, \
 		$(XORG_LIBDIR)/libXext.so)
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-Xext)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-Xfixes.make b/rules/xorg-lib-Xfixes.make
index 5ab214e2f..d203b6c85 100644
--- a/rules/xorg-lib-Xfixes.make
+++ b/rules/xorg-lib-Xfixes.make
@@ -106,18 +106,18 @@ xorg-lib-Xfixes_targetinstall: $(STATEDIR)/xorg-lib-Xfixes.targetinstall
 $(STATEDIR)/xorg-lib-Xfixes.targetinstall: $(xorg-lib-Xfixes_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xfixes)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XFIXES_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-Xfixes)
+	@$(call install_fixup, xorg-lib-Xfixes,PACKAGE,xorg-lib-xfixes)
+	@$(call install_fixup, xorg-lib-Xfixes,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-Xfixes,VERSION,$(XORG_LIB_XFIXES_VERSION))
+	@$(call install_fixup, xorg-lib-Xfixes,SECTION,base)
+	@$(call install_fixup, xorg-lib-Xfixes,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-Xfixes,DEPENDS,)
+	@$(call install_fixup, xorg-lib-Xfixes,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-Xfixes)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-Xfont.make b/rules/xorg-lib-Xfont.make
index e4cc1425d..3b7a7d94e 100644
--- a/rules/xorg-lib-Xfont.make
+++ b/rules/xorg-lib-Xfont.make
@@ -106,28 +106,28 @@ xorg-lib-Xfont_targetinstall: $(STATEDIR)/xorg-lib-Xfont.targetinstall
 $(STATEDIR)/xorg-lib-Xfont.targetinstall: $(xorg-lib-Xfont_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xfont)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XFONT_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_init, xorg-lib-Xfont)
+	@$(call install_fixup, xorg-lib-Xfont,PACKAGE,xorg-lib-xfont)
+	@$(call install_fixup, xorg-lib-Xfont,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-Xfont,VERSION,$(XORG_LIB_XFONT_VERSION))
+	@$(call install_fixup, xorg-lib-Xfont,SECTION,base)
+	@$(call install_fixup, xorg-lib-Xfont,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-Xfont,DEPENDS,)
+	@$(call install_fixup, xorg-lib-Xfont,DESCRIPTION,missing)
+
+	@$(call install_copy, xorg-lib-Xfont, 0, 0, 0644, \
 		$(XORG_LIB_XFONT_DIR)/src/.libs/libXfont.so.1.4.1, \
 		$(XORG_LIBDIR)/libXfont.so.1.4.1)
 
-	@$(call install_link, \
+	@$(call install_link, xorg-lib-Xfont, \
 		libXfont.so.1.4.1, \
 		$(XORG_LIBDIR)/libXfont.so.1)
 	
-	@$(call install_link, \
+	@$(call install_link, xorg-lib-Xfont, \
 		libXfont.so.1.4.1, \
 		$(XORG_LIBDIR)/libXfont.so)
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-Xfont)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-Xfontcache.make b/rules/xorg-lib-Xfontcache.make
index 6810ae3a0..0bb8e720a 100644
--- a/rules/xorg-lib-Xfontcache.make
+++ b/rules/xorg-lib-Xfontcache.make
@@ -108,18 +108,18 @@ xorg-lib-Xfontcache_targetinstall: $(STATEDIR)/xorg-lib-Xfontcache.targetinstall
 $(STATEDIR)/xorg-lib-Xfontcache.targetinstall: $(xorg-lib-Xfontcache_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xfontcache)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XFONTCACHE_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-Xfontcache)
+	@$(call install_fixup, xorg-lib-Xfontcache,PACKAGE,xorg-lib-xfontcache)
+	@$(call install_fixup, xorg-lib-Xfontcache,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-Xfontcache,VERSION,$(XORG_LIB_XFONTCACHE_VERSION))
+	@$(call install_fixup, xorg-lib-Xfontcache,SECTION,base)
+	@$(call install_fixup, xorg-lib-Xfontcache,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-Xfontcache,DEPENDS,)
+	@$(call install_fixup, xorg-lib-Xfontcache,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-Xfontcache)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-Xft.make b/rules/xorg-lib-Xft.make
index 405f70622..658a51cc1 100644
--- a/rules/xorg-lib-Xft.make
+++ b/rules/xorg-lib-Xft.make
@@ -106,18 +106,18 @@ xorg-lib-Xft_targetinstall: $(STATEDIR)/xorg-lib-Xft.targetinstall
 $(STATEDIR)/xorg-lib-Xft.targetinstall: $(xorg-lib-Xft_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xft)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XFT_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-Xft)
+	@$(call install_fixup, xorg-lib-Xft,PACKAGE,xorg-lib-xft)
+	@$(call install_fixup, xorg-lib-Xft,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-Xft,VERSION,$(XORG_LIB_XFT_VERSION))
+	@$(call install_fixup, xorg-lib-Xft,SECTION,base)
+	@$(call install_fixup, xorg-lib-Xft,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-Xft,DEPENDS,)
+	@$(call install_fixup, xorg-lib-Xft,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-Xft)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-Xi.make b/rules/xorg-lib-Xi.make
index ed3f26fe3..b5514f841 100644
--- a/rules/xorg-lib-Xi.make
+++ b/rules/xorg-lib-Xi.make
@@ -108,18 +108,18 @@ xorg-lib-Xi_targetinstall: $(STATEDIR)/xorg-lib-Xi.targetinstall
 $(STATEDIR)/xorg-lib-Xi.targetinstall: $(xorg-lib-Xi_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xi)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XI_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-Xi)
+	@$(call install_fixup, xorg-lib-Xi,PACKAGE,xorg-lib-xi)
+	@$(call install_fixup, xorg-lib-Xi,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-Xi,VERSION,$(XORG_LIB_XI_VERSION))
+	@$(call install_fixup, xorg-lib-Xi,SECTION,base)
+	@$(call install_fixup, xorg-lib-Xi,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-Xi,DEPENDS,)
+	@$(call install_fixup, xorg-lib-Xi,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-Xi)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-Xinerama.make b/rules/xorg-lib-Xinerama.make
index 092a7f89f..472ffdf61 100644
--- a/rules/xorg-lib-Xinerama.make
+++ b/rules/xorg-lib-Xinerama.make
@@ -106,18 +106,18 @@ xorg-lib-Xinerama_targetinstall: $(STATEDIR)/xorg-lib-Xinerama.targetinstall
 $(STATEDIR)/xorg-lib-Xinerama.targetinstall: $(xorg-lib-Xinerama_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xinerama)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XINERAMA_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-Xinerama)
+	@$(call install_fixup, xorg-lib-Xinerama,PACKAGE,xorg-lib-xinerama)
+	@$(call install_fixup, xorg-lib-Xinerama,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-Xinerama,VERSION,$(XORG_LIB_XINERAMA_VERSION))
+	@$(call install_fixup, xorg-lib-Xinerama,SECTION,base)
+	@$(call install_fixup, xorg-lib-Xinerama,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-Xinerama,DEPENDS,)
+	@$(call install_fixup, xorg-lib-Xinerama,DESCRIPTION,missing)
 #FIXME
 
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-Xinerama)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-Xmu.make b/rules/xorg-lib-Xmu.make
index 7e1efb1f7..359ce3490 100644
--- a/rules/xorg-lib-Xmu.make
+++ b/rules/xorg-lib-Xmu.make
@@ -106,40 +106,40 @@ xorg-lib-Xmu_targetinstall: $(STATEDIR)/xorg-lib-Xmu.targetinstall
 $(STATEDIR)/xorg-lib-Xmu.targetinstall: $(xorg-lib-Xmu_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xmu)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XMU_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_init, xorg-lib-Xmu)
+	@$(call install_fixup, xorg-lib-Xmu,PACKAGE,xorg-lib-xmu)
+	@$(call install_fixup, xorg-lib-Xmu,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-Xmu,VERSION,$(XORG_LIB_XMU_VERSION))
+	@$(call install_fixup, xorg-lib-Xmu,SECTION,base)
+	@$(call install_fixup, xorg-lib-Xmu,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-Xmu,DEPENDS,)
+	@$(call install_fixup, xorg-lib-Xmu,DESCRIPTION,missing)
+
+	@$(call install_copy, xorg-lib-Xmu, 0, 0, 0644, \
 		$(XORG_LIB_XMU_DIR)/src/.libs/libXmu.so.6.2.0, \
 		$(XORG_LIBDIR)/libXmu.so.6.2.0)
 
-	@$(call install_link, \
+	@$(call install_link, xorg-lib-Xmu, \
 		libXmu.so.6.2.0, \
 		$(XORG_LIBDIR)/libXmu.so.6)
 
-	@$(call install_link, \
+	@$(call install_link, xorg-lib-Xmu, \
 		libXmu.so.6.2.0, \
 		$(XORG_LIBDIR)/libXmu.so)
 
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_copy, xorg-lib-Xmu, 0, 0, 0644, \
 		$(XORG_LIB_XMU_DIR)/src/.libs/libXmuu.so.1.0.0, \
 		$(XORG_LIBDIR)/libXmuu.so.1.0.0)
 
-	@$(call install_link, \
+	@$(call install_link, xorg-lib-Xmu, \
 		libXmuu.so.1.0.0, \
 		$(XORG_LIBDIR)/libXmuu.so.1)
 
-	@$(call install_link, \
+	@$(call install_link, xorg-lib-Xmu, \
 		libXmuu.so.1.0.0, \
 		$(XORG_LIBDIR)/libXmuu.so)
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-Xmu)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-Xp.make b/rules/xorg-lib-Xp.make
index cdd9752a9..f2c5c4747 100644
--- a/rules/xorg-lib-Xp.make
+++ b/rules/xorg-lib-Xp.make
@@ -106,19 +106,19 @@ xorg-lib-Xp_targetinstall: $(STATEDIR)/xorg-lib-Xp.targetinstall
 $(STATEDIR)/xorg-lib-Xp.targetinstall: $(xorg-lib-Xp_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xp)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XP_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-Xp)
+	@$(call install_fixup, xorg-lib-Xp,PACKAGE,xorg-lib-xp)
+	@$(call install_fixup, xorg-lib-Xp,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-Xp,VERSION,$(XORG_LIB_XP_VERSION))
+	@$(call install_fixup, xorg-lib-Xp,SECTION,base)
+	@$(call install_fixup, xorg-lib-Xp,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-Xp,DEPENDS,)
+	@$(call install_fixup, xorg-lib-Xp,DESCRIPTION,missing)
 
 #FIXME
 
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-Xp)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-Xpm.make b/rules/xorg-lib-Xpm.make
index 829aa8ba9..df1cbec93 100644
--- a/rules/xorg-lib-Xpm.make
+++ b/rules/xorg-lib-Xpm.make
@@ -106,18 +106,18 @@ xorg-lib-Xpm_targetinstall: $(STATEDIR)/xorg-lib-Xpm.targetinstall
 $(STATEDIR)/xorg-lib-Xpm.targetinstall: $(xorg-lib-Xpm_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xpm)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XPM_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-Xpm)
+	@$(call install_fixup, xorg-lib-Xpm,PACKAGE,xorg-lib-xpm)
+	@$(call install_fixup, xorg-lib-Xpm,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-Xpm,VERSION,$(XORG_LIB_XPM_VERSION))
+	@$(call install_fixup, xorg-lib-Xpm,SECTION,base)
+	@$(call install_fixup, xorg-lib-Xpm,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-Xpm,DEPENDS,)
+	@$(call install_fixup, xorg-lib-Xpm,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-Xpm)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-XprintAppUtil.make b/rules/xorg-lib-XprintAppUtil.make
index 7814c0cfd..4788ef569 100644
--- a/rules/xorg-lib-XprintAppUtil.make
+++ b/rules/xorg-lib-XprintAppUtil.make
@@ -106,18 +106,18 @@ xorg-lib-XprintAppUtil_targetinstall: $(STATEDIR)/xorg-lib-XprintAppUtil.targeti
 $(STATEDIR)/xorg-lib-XprintAppUtil.targetinstall: $(xorg-lib-XprintAppUtil_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xprintapputil)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XPRINTAPPUTIL_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-XprintAppUtil)
+	@$(call install_fixup, xorg-lib-XprintAppUtil,PACKAGE,xorg-lib-xprintapputil)
+	@$(call install_fixup, xorg-lib-XprintAppUtil,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-XprintAppUtil,VERSION,$(XORG_LIB_XPRINTAPPUTIL_VERSION))
+	@$(call install_fixup, xorg-lib-XprintAppUtil,SECTION,base)
+	@$(call install_fixup, xorg-lib-XprintAppUtil,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-XprintAppUtil,DEPENDS,)
+	@$(call install_fixup, xorg-lib-XprintAppUtil,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-XprintAppUtil)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-XprintUtil.make b/rules/xorg-lib-XprintUtil.make
index da57cfb10..1b83cadb2 100644
--- a/rules/xorg-lib-XprintUtil.make
+++ b/rules/xorg-lib-XprintUtil.make
@@ -106,18 +106,18 @@ xorg-lib-XprintUtil_targetinstall: $(STATEDIR)/xorg-lib-XprintUtil.targetinstall
 $(STATEDIR)/xorg-lib-XprintUtil.targetinstall: $(xorg-lib-XprintUtil_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xprintutil)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XPRINTUTIL_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-XprintUtil)
+	@$(call install_fixup, xorg-lib-XprintUtil,PACKAGE,xorg-lib-xprintutil)
+	@$(call install_fixup, xorg-lib-XprintUtil,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-XprintUtil,VERSION,$(XORG_LIB_XPRINTUTIL_VERSION))
+	@$(call install_fixup, xorg-lib-XprintUtil,SECTION,base)
+	@$(call install_fixup, xorg-lib-XprintUtil,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-XprintUtil,DEPENDS,)
+	@$(call install_fixup, xorg-lib-XprintUtil,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-XprintUtil)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-Xrandr.make b/rules/xorg-lib-Xrandr.make
index dc63b2b00..4c794b3fa 100644
--- a/rules/xorg-lib-Xrandr.make
+++ b/rules/xorg-lib-Xrandr.make
@@ -106,18 +106,18 @@ xorg-lib-Xrandr_targetinstall: $(STATEDIR)/xorg-lib-Xrandr.targetinstall
 $(STATEDIR)/xorg-lib-Xrandr.targetinstall: $(xorg-lib-Xrandr_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xrandr)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XRANDR_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-Xrandr)
+	@$(call install_fixup, xorg-lib-Xrandr,PACKAGE,xorg-lib-xrandr)
+	@$(call install_fixup, xorg-lib-Xrandr,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-Xrandr,VERSION,$(XORG_LIB_XRANDR_VERSION))
+	@$(call install_fixup, xorg-lib-Xrandr,SECTION,base)
+	@$(call install_fixup, xorg-lib-Xrandr,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-Xrandr,DEPENDS,)
+	@$(call install_fixup, xorg-lib-Xrandr,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-Xrandr)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-Xrender.make b/rules/xorg-lib-Xrender.make
index 2113b39e7..6019a5bc7 100644
--- a/rules/xorg-lib-Xrender.make
+++ b/rules/xorg-lib-Xrender.make
@@ -108,18 +108,18 @@ xorg-lib-Xrender_targetinstall: $(STATEDIR)/xorg-lib-Xrender.targetinstall
 $(STATEDIR)/xorg-lib-Xrender.targetinstall: $(xorg-lib-Xrender_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xrender)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XRENDER_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-Xrender)
+	@$(call install_fixup, xorg-lib-Xrender,PACKAGE,xorg-lib-xrender)
+	@$(call install_fixup, xorg-lib-Xrender,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-Xrender,VERSION,$(XORG_LIB_XRENDER_VERSION))
+	@$(call install_fixup, xorg-lib-Xrender,SECTION,base)
+	@$(call install_fixup, xorg-lib-Xrender,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-Xrender,DEPENDS,)
+	@$(call install_fixup, xorg-lib-Xrender,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-Xrender)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-Xres.make b/rules/xorg-lib-Xres.make
index f817c0351..6674f4df5 100644
--- a/rules/xorg-lib-Xres.make
+++ b/rules/xorg-lib-Xres.make
@@ -108,18 +108,18 @@ xorg-lib-Xres_targetinstall: $(STATEDIR)/xorg-lib-Xres.targetinstall
 $(STATEDIR)/xorg-lib-Xres.targetinstall: $(xorg-lib-Xres_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xres)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XRES_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-Xres)
+	@$(call install_fixup, xorg-lib-Xres,PACKAGE,xorg-lib-xres)
+	@$(call install_fixup, xorg-lib-Xres,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-Xres,VERSION,$(XORG_LIB_XRES_VERSION))
+	@$(call install_fixup, xorg-lib-Xres,SECTION,base)
+	@$(call install_fixup, xorg-lib-Xres,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-Xres,DEPENDS,)
+	@$(call install_fixup, xorg-lib-Xres,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-Xres)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-Xt.make b/rules/xorg-lib-Xt.make
index 9e4cef5fe..23d61522f 100644
--- a/rules/xorg-lib-Xt.make
+++ b/rules/xorg-lib-Xt.make
@@ -109,28 +109,28 @@ xorg-lib-Xt_targetinstall: $(STATEDIR)/xorg-lib-Xt.targetinstall
 $(STATEDIR)/xorg-lib-Xt.targetinstall: $(xorg-lib-Xt_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xt)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XT_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_init, xorg-lib-Xt)
+	@$(call install_fixup, xorg-lib-Xt,PACKAGE,xorg-lib-xt)
+	@$(call install_fixup, xorg-lib-Xt,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-Xt,VERSION,$(XORG_LIB_XT_VERSION))
+	@$(call install_fixup, xorg-lib-Xt,SECTION,base)
+	@$(call install_fixup, xorg-lib-Xt,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-Xt,DEPENDS,)
+	@$(call install_fixup, xorg-lib-Xt,DESCRIPTION,missing)
+
+	@$(call install_copy, xorg-lib-Xt, 0, 0, 0644, \
 		$(XORG_LIB_XT_DIR)/src/.libs/libXt.so.6.0.0, \
 		$(XORG_LIBDIR)/libXt.so.6.0.0)
 
-	@$(call install_link, \
+	@$(call install_link, xorg-lib-Xt, \
 		libXt.so.6.0.0, \
 		$(XORG_LIBDIR)/libXt.so.6)
 
-	@$(call install_link, \
+	@$(call install_link, xorg-lib-Xt, \
 		libXt.so.6.0.0, \
 		$(XORG_LIBDIR)/libXt.so)
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-Xt)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-Xtst.make b/rules/xorg-lib-Xtst.make
index f449e2832..7d5a940e3 100644
--- a/rules/xorg-lib-Xtst.make
+++ b/rules/xorg-lib-Xtst.make
@@ -106,18 +106,18 @@ xorg-lib-Xtst_targetinstall: $(STATEDIR)/xorg-lib-Xtst.targetinstall
 $(STATEDIR)/xorg-lib-Xtst.targetinstall: $(xorg-lib-Xtst_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xtst)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XTST_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-Xtst)
+	@$(call install_fixup, xorg-lib-Xtst,PACKAGE,xorg-lib-xtst)
+	@$(call install_fixup, xorg-lib-Xtst,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-Xtst,VERSION,$(XORG_LIB_XTST_VERSION))
+	@$(call install_fixup, xorg-lib-Xtst,SECTION,base)
+	@$(call install_fixup, xorg-lib-Xtst,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-Xtst,DEPENDS,)
+	@$(call install_fixup, xorg-lib-Xtst,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-Xtst)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-Xv.make b/rules/xorg-lib-Xv.make
index 1d6f3db5e..1a145ffe3 100644
--- a/rules/xorg-lib-Xv.make
+++ b/rules/xorg-lib-Xv.make
@@ -108,18 +108,18 @@ xorg-lib-Xv_targetinstall: $(STATEDIR)/xorg-lib-Xv.targetinstall
 $(STATEDIR)/xorg-lib-Xv.targetinstall: $(xorg-lib-Xv_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xv)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XV_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-Xv)
+	@$(call install_fixup, xorg-lib-Xv,PACKAGE,xorg-lib-xv)
+	@$(call install_fixup, xorg-lib-Xv,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-Xv,VERSION,$(XORG_LIB_XV_VERSION))
+	@$(call install_fixup, xorg-lib-Xv,SECTION,base)
+	@$(call install_fixup, xorg-lib-Xv,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-Xv,DEPENDS,)
+	@$(call install_fixup, xorg-lib-Xv,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-Xv)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-XvMC.make b/rules/xorg-lib-XvMC.make
index 48db9c961..ad9b1f5e5 100644
--- a/rules/xorg-lib-XvMC.make
+++ b/rules/xorg-lib-XvMC.make
@@ -108,18 +108,18 @@ xorg-lib-XvMC_targetinstall: $(STATEDIR)/xorg-lib-XvMC.targetinstall
 $(STATEDIR)/xorg-lib-XvMC.targetinstall: $(xorg-lib-XvMC_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xvmc)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XVMC_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-XvMC)
+	@$(call install_fixup, xorg-lib-XvMC,PACKAGE,xorg-lib-xvmc)
+	@$(call install_fixup, xorg-lib-XvMC,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-XvMC,VERSION,$(XORG_LIB_XVMC_VERSION))
+	@$(call install_fixup, xorg-lib-XvMC,SECTION,base)
+	@$(call install_fixup, xorg-lib-XvMC,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-XvMC,DEPENDS,)
+	@$(call install_fixup, xorg-lib-XvMC,DESCRIPTION,missing)
 
 # FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-XvMC)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-Xxf86dga.make b/rules/xorg-lib-Xxf86dga.make
index ddd6be550..3c7509c48 100644
--- a/rules/xorg-lib-Xxf86dga.make
+++ b/rules/xorg-lib-Xxf86dga.make
@@ -106,18 +106,18 @@ xorg-lib-Xxf86dga_targetinstall: $(STATEDIR)/xorg-lib-Xxf86dga.targetinstall
 $(STATEDIR)/xorg-lib-Xxf86dga.targetinstall: $(xorg-lib-Xxf86dga_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xxf86dga)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XXF86DGA_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-Xxf86dga)
+	@$(call install_fixup, xorg-lib-Xxf86dga,PACKAGE,xorg-lib-xxf86dga)
+	@$(call install_fixup, xorg-lib-Xxf86dga,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-Xxf86dga,VERSION,$(XORG_LIB_XXF86DGA_VERSION))
+	@$(call install_fixup, xorg-lib-Xxf86dga,SECTION,base)
+	@$(call install_fixup, xorg-lib-Xxf86dga,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-Xxf86dga,DEPENDS,)
+	@$(call install_fixup, xorg-lib-Xxf86dga,DESCRIPTION,missing)
 
 # FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-Xxf86dga)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-Xxf86misc.make b/rules/xorg-lib-Xxf86misc.make
index 01c6c1dcb..ad32322e3 100644
--- a/rules/xorg-lib-Xxf86misc.make
+++ b/rules/xorg-lib-Xxf86misc.make
@@ -108,18 +108,18 @@ xorg-lib-Xxf86misc_targetinstall: $(STATEDIR)/xorg-lib-Xxf86misc.targetinstall
 $(STATEDIR)/xorg-lib-Xxf86misc.targetinstall: $(xorg-lib-Xxf86misc_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xxf86misc)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XXF86MISC_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-Xxf86misc)
+	@$(call install_fixup, xorg-lib-Xxf86misc,PACKAGE,xorg-lib-xxf86misc)
+	@$(call install_fixup, xorg-lib-Xxf86misc,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-Xxf86misc,VERSION,$(XORG_LIB_XXF86MISC_VERSION))
+	@$(call install_fixup, xorg-lib-Xxf86misc,SECTION,base)
+	@$(call install_fixup, xorg-lib-Xxf86misc,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-Xxf86misc,DEPENDS,)
+	@$(call install_fixup, xorg-lib-Xxf86misc,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-Xxf86misc)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-Xxf86vm.make b/rules/xorg-lib-Xxf86vm.make
index 84709ef63..09672ef99 100644
--- a/rules/xorg-lib-Xxf86vm.make
+++ b/rules/xorg-lib-Xxf86vm.make
@@ -107,18 +107,18 @@ xorg-lib-Xxf86vm_targetinstall: $(STATEDIR)/xorg-lib-Xxf86vm.targetinstall
 $(STATEDIR)/xorg-lib-Xxf86vm.targetinstall: $(xorg-lib-Xxf86vm_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xxf86vm)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XXF86VM_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-Xxf86vm)
+	@$(call install_fixup, xorg-lib-Xxf86vm,PACKAGE,xorg-lib-xxf86vm)
+	@$(call install_fixup, xorg-lib-Xxf86vm,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-Xxf86vm,VERSION,$(XORG_LIB_XXF86VM_VERSION))
+	@$(call install_fixup, xorg-lib-Xxf86vm,SECTION,base)
+	@$(call install_fixup, xorg-lib-Xxf86vm,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-Xxf86vm,DEPENDS,)
+	@$(call install_fixup, xorg-lib-Xxf86vm,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-Xxf86vm)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-dmx.make b/rules/xorg-lib-dmx.make
index 987b90b79..d28b4bc32 100644
--- a/rules/xorg-lib-dmx.make
+++ b/rules/xorg-lib-dmx.make
@@ -108,18 +108,18 @@ xorg-lib-dmx_targetinstall: $(STATEDIR)/xorg-lib-dmx.targetinstall
 $(STATEDIR)/xorg-lib-dmx.targetinstall: $(xorg-lib-dmx_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-dmx)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_DMX_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-dmx)
+	@$(call install_fixup, xorg-lib-dmx,PACKAGE,xorg-lib-dmx)
+	@$(call install_fixup, xorg-lib-dmx,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-dmx,VERSION,$(XORG_LIB_DMX_VERSION))
+	@$(call install_fixup, xorg-lib-dmx,SECTION,base)
+	@$(call install_fixup, xorg-lib-dmx,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-dmx,DEPENDS,)
+	@$(call install_fixup, xorg-lib-dmx,DESCRIPTION,missing)
 
 # FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-dmx)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-fontenc.make b/rules/xorg-lib-fontenc.make
index 10b94082a..55fffab92 100644
--- a/rules/xorg-lib-fontenc.make
+++ b/rules/xorg-lib-fontenc.make
@@ -106,28 +106,28 @@ xorg-lib-fontenc_targetinstall: $(STATEDIR)/xorg-lib-fontenc.targetinstall
 $(STATEDIR)/xorg-lib-fontenc.targetinstall: $(xorg-lib-fontenc_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-fontenc)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_FONTENC_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, \
+	@$(call install_init, xorg-lib-fontenc)
+	@$(call install_fixup, xorg-lib-fontenc,PACKAGE,xorg-lib-fontenc)
+	@$(call install_fixup, xorg-lib-fontenc,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-fontenc,VERSION,$(XORG_LIB_FONTENC_VERSION))
+	@$(call install_fixup, xorg-lib-fontenc,SECTION,base)
+	@$(call install_fixup, xorg-lib-fontenc,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-fontenc,DEPENDS,)
+	@$(call install_fixup, xorg-lib-fontenc,DESCRIPTION,missing)
+
+	@$(call install_copy, xorg-lib-fontenc, 0, 0, 0644, \
 		$(XORG_LIB_FONTENC_DIR)/src/.libs/libfontenc.so.1.0.0, \
 		$(XORG_LIBDIR)/libfontenc.so.1.0.0)
 
-	@$(call install_link, \
+	@$(call install_link, xorg-lib-fontenc, \
 		libfontenc.so.1.0.0, \
 		$(XORG_LIBDIR)/libfontenc.so.1)
 
-	@$(call install_link, \
+	@$(call install_link, xorg-lib-fontenc, \
 		libfontenc.so.1.0.0, \
 		$(XORG_LIBDIR)/libfontenc.so)
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-fontenc)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-lbxutil.make b/rules/xorg-lib-lbxutil.make
index 8b5bddafd..c021f7f55 100644
--- a/rules/xorg-lib-lbxutil.make
+++ b/rules/xorg-lib-lbxutil.make
@@ -106,18 +106,18 @@ xorg-lib-lbxutil_targetinstall: $(STATEDIR)/xorg-lib-lbxutil.targetinstall
 $(STATEDIR)/xorg-lib-lbxutil.targetinstall: $(xorg-lib-lbxutil_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-lbxutil)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_LBXUTIL_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-lbxutil)
+	@$(call install_fixup, xorg-lib-lbxutil,PACKAGE,xorg-lib-lbxutil)
+	@$(call install_fixup, xorg-lib-lbxutil,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-lbxutil,VERSION,$(XORG_LIB_LBXUTIL_VERSION))
+	@$(call install_fixup, xorg-lib-lbxutil,SECTION,base)
+	@$(call install_fixup, xorg-lib-lbxutil,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-lbxutil,DEPENDS,)
+	@$(call install_fixup, xorg-lib-lbxutil,DESCRIPTION,missing)
 
 # FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-lbxutil)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-oldX.make b/rules/xorg-lib-oldX.make
index 32ba8286f..9ac7f9e18 100644
--- a/rules/xorg-lib-oldX.make
+++ b/rules/xorg-lib-oldX.make
@@ -106,18 +106,18 @@ xorg-lib-oldX_targetinstall: $(STATEDIR)/xorg-lib-oldX.targetinstall
 $(STATEDIR)/xorg-lib-oldX.targetinstall: $(xorg-lib-oldX_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-oldX)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_OLDX_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-oldX)
+	@$(call install_fixup, xorg-lib-oldX,PACKAGE,xorg-lib-oldX)
+	@$(call install_fixup, xorg-lib-oldX,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-oldX,VERSION,$(XORG_LIB_OLDX_VERSION))
+	@$(call install_fixup, xorg-lib-oldX,SECTION,base)
+	@$(call install_fixup, xorg-lib-oldX,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-oldX,DEPENDS,)
+	@$(call install_fixup, xorg-lib-oldX,DESCRIPTION,missing)
 
 # FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-oldX)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-xkbfile.make b/rules/xorg-lib-xkbfile.make
index f35ce3270..1dbb94dd9 100644
--- a/rules/xorg-lib-xkbfile.make
+++ b/rules/xorg-lib-xkbfile.make
@@ -106,18 +106,18 @@ xorg-lib-xkbfile_targetinstall: $(STATEDIR)/xorg-lib-xkbfile.targetinstall
 $(STATEDIR)/xorg-lib-xkbfile.targetinstall: $(xorg-lib-xkbfile_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xkbfile)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XKBFILE_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-xkbfile)
+	@$(call install_fixup, xorg-lib-xkbfile,PACKAGE,xorg-lib-xkbfile)
+	@$(call install_fixup, xorg-lib-xkbfile,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-xkbfile,VERSION,$(XORG_LIB_XKBFILE_VERSION))
+	@$(call install_fixup, xorg-lib-xkbfile,SECTION,base)
+	@$(call install_fixup, xorg-lib-xkbfile,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-xkbfile,DEPENDS,)
+	@$(call install_fixup, xorg-lib-xkbfile,DESCRIPTION,missing)
 
 # FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-xkbfile)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-xkbui.make b/rules/xorg-lib-xkbui.make
index eaa88d044..6372c48b7 100644
--- a/rules/xorg-lib-xkbui.make
+++ b/rules/xorg-lib-xkbui.make
@@ -106,18 +106,18 @@ xorg-lib-xkbui_targetinstall: $(STATEDIR)/xorg-lib-xkbui.targetinstall
 $(STATEDIR)/xorg-lib-xkbui.targetinstall: $(xorg-lib-xkbui_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xkbui)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XKBUI_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-xkbui)
+	@$(call install_fixup, xorg-lib-xkbui,PACKAGE,xorg-lib-xkbui)
+	@$(call install_fixup, xorg-lib-xkbui,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-xkbui,VERSION,$(XORG_LIB_XKBUI_VERSION))
+	@$(call install_fixup, xorg-lib-xkbui,SECTION,base)
+	@$(call install_fixup, xorg-lib-xkbui,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-xkbui,DEPENDS,)
+	@$(call install_fixup, xorg-lib-xkbui,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-xkbui)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-lib-xtrans.make b/rules/xorg-lib-xtrans.make
index 3caf3b82c..2870b90bb 100644
--- a/rules/xorg-lib-xtrans.make
+++ b/rules/xorg-lib-xtrans.make
@@ -106,18 +106,18 @@ xorg-lib-xtrans_targetinstall: $(STATEDIR)/xorg-lib-xtrans.targetinstall
 $(STATEDIR)/xorg-lib-xtrans.targetinstall: $(xorg-lib-xtrans_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-lib-xtrans)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_LIB_XTRANS_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-lib-xtrans)
+	@$(call install_fixup, xorg-lib-xtrans,PACKAGE,xorg-lib-xtrans)
+	@$(call install_fixup, xorg-lib-xtrans,PRIORITY,optional)
+	@$(call install_fixup, xorg-lib-xtrans,VERSION,$(XORG_LIB_XTRANS_VERSION))
+	@$(call install_fixup, xorg-lib-xtrans,SECTION,base)
+	@$(call install_fixup, xorg-lib-xtrans,AUTHOR,"Erwin Rol <ero\@pengutronix.de>")
+	@$(call install_fixup, xorg-lib-xtrans,DEPENDS,)
+	@$(call install_fixup, xorg-lib-xtrans,DESCRIPTION,missing)
 
 #FIXME
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-lib-xtrans)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-proto-applewm.make b/rules/xorg-proto-applewm.make
index 560b8e8fd..48f12302c 100644
--- a/rules/xorg-proto-applewm.make
+++ b/rules/xorg-proto-applewm.make
@@ -106,16 +106,16 @@ xorg-proto-applewm_targetinstall: $(STATEDIR)/xorg-proto-applewm.targetinstall
 $(STATEDIR)/xorg-proto-applewm.targetinstall: $(xorg-proto-applewm_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-proto-applewm)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_PROTO_APPLEWM_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-proto-applewm)
+	@$(call install_fixup, xorg-proto-applewm,PACKAGE,xorg-proto-applewm)
+	@$(call install_fixup, xorg-proto-applewm,PRIORITY,optional)
+	@$(call install_fixup, xorg-proto-applewm,VERSION,$(XORG_PROTO_APPLEWM_VERSION))
+	@$(call install_fixup, xorg-proto-applewm,SECTION,base)
+	@$(call install_fixup, xorg-proto-applewm,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
+	@$(call install_fixup, xorg-proto-applewm,DEPENDS,)
+	@$(call install_fixup, xorg-proto-applewm,DESCRIPTION,missing)
+
+	@$(call install_finish, xorg-proto-applewm)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-proto-bigreqs.make b/rules/xorg-proto-bigreqs.make
index 9b0d01fb1..1e2f70e2b 100644
--- a/rules/xorg-proto-bigreqs.make
+++ b/rules/xorg-proto-bigreqs.make
@@ -106,16 +106,16 @@ xorg-proto-bigreqs_targetinstall: $(STATEDIR)/xorg-proto-bigreqs.targetinstall
 $(STATEDIR)/xorg-proto-bigreqs.targetinstall: $(xorg-proto-bigreqs_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-proto-bigreqs)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_PROTO_BIGREQS_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-proto-bigreqs)
+	@$(call install_fixup, xorg-proto-bigreqs,PACKAGE,xorg-proto-bigreqs)
+	@$(call install_fixup, xorg-proto-bigreqs,PRIORITY,optional)
+	@$(call install_fixup, xorg-proto-bigreqs,VERSION,$(XORG_PROTO_BIGREQS_VERSION))
+	@$(call install_fixup, xorg-proto-bigreqs,SECTION,base)
+	@$(call install_fixup, xorg-proto-bigreqs,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
+	@$(call install_fixup, xorg-proto-bigreqs,DEPENDS,)
+	@$(call install_fixup, xorg-proto-bigreqs,DESCRIPTION,missing)
+
+	@$(call install_finish, xorg-proto-bigreqs)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-proto-composite.make b/rules/xorg-proto-composite.make
index 5e8350f6d..eac268693 100644
--- a/rules/xorg-proto-composite.make
+++ b/rules/xorg-proto-composite.make
@@ -106,16 +106,16 @@ xorg-proto-composite_targetinstall: $(STATEDIR)/xorg-proto-composite.targetinsta
 $(STATEDIR)/xorg-proto-composite.targetinstall: $(xorg-proto-composite_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-proto-composite)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_PROTO_COMPOSITE_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-proto-composite)
+	@$(call install_fixup, xorg-proto-composite,PACKAGE,xorg-proto-composite)
+	@$(call install_fixup, xorg-proto-composite,PRIORITY,optional)
+	@$(call install_fixup, xorg-proto-composite,VERSION,$(XORG_PROTO_COMPOSITE_VERSION))
+	@$(call install_fixup, xorg-proto-composite,SECTION,base)
+	@$(call install_fixup, xorg-proto-composite,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
+	@$(call install_fixup, xorg-proto-composite,DEPENDS,)
+	@$(call install_fixup, xorg-proto-composite,DESCRIPTION,missing)
+
+	@$(call install_finish, xorg-proto-composite)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-proto-damage.make b/rules/xorg-proto-damage.make
index fb835b5a8..e2b53e5b0 100644
--- a/rules/xorg-proto-damage.make
+++ b/rules/xorg-proto-damage.make
@@ -106,16 +106,16 @@ xorg-proto-damage_targetinstall: $(STATEDIR)/xorg-proto-damage.targetinstall
 $(STATEDIR)/xorg-proto-damage.targetinstall: $(xorg-proto-damage_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-proto-damage)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_PROTO_DAMAGE_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-proto-damage)
+	@$(call install_fixup, xorg-proto-damage,PACKAGE,xorg-proto-damage)
+	@$(call install_fixup, xorg-proto-damage,PRIORITY,optional)
+	@$(call install_fixup, xorg-proto-damage,VERSION,$(XORG_PROTO_DAMAGE_VERSION))
+	@$(call install_fixup, xorg-proto-damage,SECTION,base)
+	@$(call install_fixup, xorg-proto-damage,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
+	@$(call install_fixup, xorg-proto-damage,DEPENDS,)
+	@$(call install_fixup, xorg-proto-damage,DESCRIPTION,missing)
+
+	@$(call install_finish, xorg-proto-damage)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-proto-dmx.make b/rules/xorg-proto-dmx.make
index 6d7f860d4..4cb423e1b 100644
--- a/rules/xorg-proto-dmx.make
+++ b/rules/xorg-proto-dmx.make
@@ -106,16 +106,16 @@ xorg-proto-dmx_targetinstall: $(STATEDIR)/xorg-proto-dmx.targetinstall
 $(STATEDIR)/xorg-proto-dmx.targetinstall: $(xorg-proto-dmx_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-proto-dmx)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_PROTO_DMX_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-proto-dmx)
+	@$(call install_fixup, xorg-proto-dmx,PACKAGE,xorg-proto-dmx)
+	@$(call install_fixup, xorg-proto-dmx,PRIORITY,optional)
+	@$(call install_fixup, xorg-proto-dmx,VERSION,$(XORG_PROTO_DMX_VERSION))
+	@$(call install_fixup, xorg-proto-dmx,SECTION,base)
+	@$(call install_fixup, xorg-proto-dmx,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
+	@$(call install_fixup, xorg-proto-dmx,DEPENDS,)
+	@$(call install_fixup, xorg-proto-dmx,DESCRIPTION,missing)
+
+	@$(call install_finish, xorg-proto-dmx)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-proto-evieext.make b/rules/xorg-proto-evieext.make
index fc63273eb..a9f9de0fc 100644
--- a/rules/xorg-proto-evieext.make
+++ b/rules/xorg-proto-evieext.make
@@ -106,16 +106,16 @@ xorg-proto-evieext_targetinstall: $(STATEDIR)/xorg-proto-evieext.targetinstall
 $(STATEDIR)/xorg-proto-evieext.targetinstall: $(xorg-proto-evieext_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-proto-evieext)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_PROTO_EVIEEXT_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-proto-evieext)
+	@$(call install_fixup, xorg-proto-evieext,PACKAGE,xorg-proto-evieext)
+	@$(call install_fixup, xorg-proto-evieext,PRIORITY,optional)
+	@$(call install_fixup, xorg-proto-evieext,VERSION,$(XORG_PROTO_EVIEEXT_VERSION))
+	@$(call install_fixup, xorg-proto-evieext,SECTION,base)
+	@$(call install_fixup, xorg-proto-evieext,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
+	@$(call install_fixup, xorg-proto-evieext,DEPENDS,)
+	@$(call install_fixup, xorg-proto-evieext,DESCRIPTION,missing)
+
+	@$(call install_finish, xorg-proto-evieext)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-proto-fixes.make b/rules/xorg-proto-fixes.make
index 3e76751a0..67cc118eb 100644
--- a/rules/xorg-proto-fixes.make
+++ b/rules/xorg-proto-fixes.make
@@ -106,16 +106,16 @@ xorg-proto-fixes_targetinstall: $(STATEDIR)/xorg-proto-fixes.targetinstall
 $(STATEDIR)/xorg-proto-fixes.targetinstall: $(xorg-proto-fixes_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-proto-fixes)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_PROTO_FIXES_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-proto-fixes)
+	@$(call install_fixup, xorg-proto-fixes,PACKAGE,xorg-proto-fixes)
+	@$(call install_fixup, xorg-proto-fixes,PRIORITY,optional)
+	@$(call install_fixup, xorg-proto-fixes,VERSION,$(XORG_PROTO_FIXES_VERSION))
+	@$(call install_fixup, xorg-proto-fixes,SECTION,base)
+	@$(call install_fixup, xorg-proto-fixes,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
+	@$(call install_fixup, xorg-proto-fixes,DEPENDS,)
+	@$(call install_fixup, xorg-proto-fixes,DESCRIPTION,missing)
+
+	@$(call install_finish, xorg-proto-fixes)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-proto-fontcache.make b/rules/xorg-proto-fontcache.make
index baa79f85c..7671c974a 100644
--- a/rules/xorg-proto-fontcache.make
+++ b/rules/xorg-proto-fontcache.make
@@ -106,16 +106,16 @@ xorg-proto-fontcache_targetinstall: $(STATEDIR)/xorg-proto-fontcache.targetinsta
 $(STATEDIR)/xorg-proto-fontcache.targetinstall: $(xorg-proto-fontcache_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-proto-fontcache)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_PROTO_FONTCACHE_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-proto-fontcache)
+	@$(call install_fixup, xorg-proto-fontcache,PACKAGE,xorg-proto-fontcache)
+	@$(call install_fixup, xorg-proto-fontcache,PRIORITY,optional)
+	@$(call install_fixup, xorg-proto-fontcache,VERSION,$(XORG_PROTO_FONTCACHE_VERSION))
+	@$(call install_fixup, xorg-proto-fontcache,SECTION,base)
+	@$(call install_fixup, xorg-proto-fontcache,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
+	@$(call install_fixup, xorg-proto-fontcache,DEPENDS,)
+	@$(call install_fixup, xorg-proto-fontcache,DESCRIPTION,missing)
+
+	@$(call install_finish, xorg-proto-fontcache)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-proto-fonts.make b/rules/xorg-proto-fonts.make
index 28df9abe2..061dfa589 100644
--- a/rules/xorg-proto-fonts.make
+++ b/rules/xorg-proto-fonts.make
@@ -106,16 +106,16 @@ xorg-proto-fonts_targetinstall: $(STATEDIR)/xorg-proto-fonts.targetinstall
 $(STATEDIR)/xorg-proto-fonts.targetinstall: $(xorg-proto-fonts_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-proto-fonts)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_PROTO_FONTS_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-proto-fonts)
+	@$(call install_fixup, xorg-proto-fonts,PACKAGE,xorg-proto-fonts)
+	@$(call install_fixup, xorg-proto-fonts,PRIORITY,optional)
+	@$(call install_fixup, xorg-proto-fonts,VERSION,$(XORG_PROTO_FONTS_VERSION))
+	@$(call install_fixup, xorg-proto-fonts,SECTION,base)
+	@$(call install_fixup, xorg-proto-fonts,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
+	@$(call install_fixup, xorg-proto-fonts,DEPENDS,)
+	@$(call install_fixup, xorg-proto-fonts,DESCRIPTION,missing)
+
+	@$(call install_finish, xorg-proto-fonts)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-proto-gl.make b/rules/xorg-proto-gl.make
index 1825333c7..29386d70d 100644
--- a/rules/xorg-proto-gl.make
+++ b/rules/xorg-proto-gl.make
@@ -106,16 +106,16 @@ xorg-proto-gl_targetinstall: $(STATEDIR)/xorg-proto-gl.targetinstall
 $(STATEDIR)/xorg-proto-gl.targetinstall: $(xorg-proto-gl_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-proto-gl)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_PROTO_GL_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-proto-gl)
+	@$(call install_fixup, xorg-proto-gl,PACKAGE,xorg-proto-gl)
+	@$(call install_fixup, xorg-proto-gl,PRIORITY,optional)
+	@$(call install_fixup, xorg-proto-gl,VERSION,$(XORG_PROTO_GL_VERSION))
+	@$(call install_fixup, xorg-proto-gl,SECTION,base)
+	@$(call install_fixup, xorg-proto-gl,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
+	@$(call install_fixup, xorg-proto-gl,DEPENDS,)
+	@$(call install_fixup, xorg-proto-gl,DESCRIPTION,missing)
+
+	@$(call install_finish, xorg-proto-gl)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-proto-input.make b/rules/xorg-proto-input.make
index b8b85eab4..a08b7749b 100644
--- a/rules/xorg-proto-input.make
+++ b/rules/xorg-proto-input.make
@@ -106,16 +106,16 @@ xorg-proto-input_targetinstall: $(STATEDIR)/xorg-proto-input.targetinstall
 $(STATEDIR)/xorg-proto-input.targetinstall: $(xorg-proto-input_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-proto-input)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_PROTO_INPUT_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-proto-input)
+	@$(call install_fixup, xorg-proto-input,PACKAGE,xorg-proto-input)
+	@$(call install_fixup, xorg-proto-input,PRIORITY,optional)
+	@$(call install_fixup, xorg-proto-input,VERSION,$(XORG_PROTO_INPUT_VERSION))
+	@$(call install_fixup, xorg-proto-input,SECTION,base)
+	@$(call install_fixup, xorg-proto-input,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
+	@$(call install_fixup, xorg-proto-input,DEPENDS,)
+	@$(call install_fixup, xorg-proto-input,DESCRIPTION,missing)
+
+	@$(call install_finish, xorg-proto-input)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-proto-kb.make b/rules/xorg-proto-kb.make
index 0773cb716..4f761a192 100644
--- a/rules/xorg-proto-kb.make
+++ b/rules/xorg-proto-kb.make
@@ -106,16 +106,16 @@ xorg-proto-kb_targetinstall: $(STATEDIR)/xorg-proto-kb.targetinstall
 $(STATEDIR)/xorg-proto-kb.targetinstall: $(xorg-proto-kb_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-proto-kb)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_PROTO_KB_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-proto-kb)
+	@$(call install_fixup, xorg-proto-kb,PACKAGE,xorg-proto-kb)
+	@$(call install_fixup, xorg-proto-kb,PRIORITY,optional)
+	@$(call install_fixup, xorg-proto-kb,VERSION,$(XORG_PROTO_KB_VERSION))
+	@$(call install_fixup, xorg-proto-kb,SECTION,base)
+	@$(call install_fixup, xorg-proto-kb,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
+	@$(call install_fixup, xorg-proto-kb,DEPENDS,)
+	@$(call install_fixup, xorg-proto-kb,DESCRIPTION,missing)
+
+	@$(call install_finish, xorg-proto-kb)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-proto-print.make b/rules/xorg-proto-print.make
index b022a6446..a9842f9e1 100644
--- a/rules/xorg-proto-print.make
+++ b/rules/xorg-proto-print.make
@@ -106,16 +106,16 @@ xorg-proto-print_targetinstall: $(STATEDIR)/xorg-proto-print.targetinstall
 $(STATEDIR)/xorg-proto-print.targetinstall: $(xorg-proto-print_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-proto-print)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_PROTO_PRINT_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-proto-print)
+	@$(call install_fixup, xorg-proto-print,PACKAGE,xorg-proto-print)
+	@$(call install_fixup, xorg-proto-print,PRIORITY,optional)
+	@$(call install_fixup, xorg-proto-print,VERSION,$(XORG_PROTO_PRINT_VERSION))
+	@$(call install_fixup, xorg-proto-print,SECTION,base)
+	@$(call install_fixup, xorg-proto-print,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
+	@$(call install_fixup, xorg-proto-print,DEPENDS,)
+	@$(call install_fixup, xorg-proto-print,DESCRIPTION,missing)
+
+	@$(call install_finish, xorg-proto-print)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-proto-randr.make b/rules/xorg-proto-randr.make
index ae3ab96b5..d117fce35 100644
--- a/rules/xorg-proto-randr.make
+++ b/rules/xorg-proto-randr.make
@@ -106,16 +106,16 @@ xorg-proto-randr_targetinstall: $(STATEDIR)/xorg-proto-randr.targetinstall
 $(STATEDIR)/xorg-proto-randr.targetinstall: $(xorg-proto-randr_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-proto-randr)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_PROTO_RANDR_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-proto-randr)
+	@$(call install_fixup, xorg-proto-randr,PACKAGE,xorg-proto-randr)
+	@$(call install_fixup, xorg-proto-randr,PRIORITY,optional)
+	@$(call install_fixup, xorg-proto-randr,VERSION,$(XORG_PROTO_RANDR_VERSION))
+	@$(call install_fixup, xorg-proto-randr,SECTION,base)
+	@$(call install_fixup, xorg-proto-randr,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
+	@$(call install_fixup, xorg-proto-randr,DEPENDS,)
+	@$(call install_fixup, xorg-proto-randr,DESCRIPTION,missing)
+
+	@$(call install_finish, xorg-proto-randr)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-proto-record.make b/rules/xorg-proto-record.make
index 65d82390b..52f8c0e56 100644
--- a/rules/xorg-proto-record.make
+++ b/rules/xorg-proto-record.make
@@ -106,16 +106,16 @@ xorg-proto-record_targetinstall: $(STATEDIR)/xorg-proto-record.targetinstall
 $(STATEDIR)/xorg-proto-record.targetinstall: $(xorg-proto-record_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-proto-record)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_PROTO_RECORD_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-proto-record)
+	@$(call install_fixup, xorg-proto-record,PACKAGE,xorg-proto-record)
+	@$(call install_fixup, xorg-proto-record,PRIORITY,optional)
+	@$(call install_fixup, xorg-proto-record,VERSION,$(XORG_PROTO_RECORD_VERSION))
+	@$(call install_fixup, xorg-proto-record,SECTION,base)
+	@$(call install_fixup, xorg-proto-record,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
+	@$(call install_fixup, xorg-proto-record,DEPENDS,)
+	@$(call install_fixup, xorg-proto-record,DESCRIPTION,missing)
+
+	@$(call install_finish, xorg-proto-record)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-proto-render.make b/rules/xorg-proto-render.make
index 9599636b3..98a56f2bf 100644
--- a/rules/xorg-proto-render.make
+++ b/rules/xorg-proto-render.make
@@ -106,16 +106,16 @@ xorg-proto-render_targetinstall: $(STATEDIR)/xorg-proto-render.targetinstall
 $(STATEDIR)/xorg-proto-render.targetinstall: $(xorg-proto-render_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-proto-render)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_PROTO_RENDER_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-proto-render)
+	@$(call install_fixup, xorg-proto-render,PACKAGE,xorg-proto-render)
+	@$(call install_fixup, xorg-proto-render,PRIORITY,optional)
+	@$(call install_fixup, xorg-proto-render,VERSION,$(XORG_PROTO_RENDER_VERSION))
+	@$(call install_fixup, xorg-proto-render,SECTION,base)
+	@$(call install_fixup, xorg-proto-render,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
+	@$(call install_fixup, xorg-proto-render,DEPENDS,)
+	@$(call install_fixup, xorg-proto-render,DESCRIPTION,missing)
+
+	@$(call install_finish, xorg-proto-render)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-proto-resource.make b/rules/xorg-proto-resource.make
index 86a3ca20a..b2ea308f8 100644
--- a/rules/xorg-proto-resource.make
+++ b/rules/xorg-proto-resource.make
@@ -106,16 +106,16 @@ xorg-proto-resource_targetinstall: $(STATEDIR)/xorg-proto-resource.targetinstall
 $(STATEDIR)/xorg-proto-resource.targetinstall: $(xorg-proto-resource_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-proto-resource)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_PROTO_RESOURCE_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-proto-resource)
+	@$(call install_fixup, xorg-proto-resource,PACKAGE,xorg-proto-resource)
+	@$(call install_fixup, xorg-proto-resource,PRIORITY,optional)
+	@$(call install_fixup, xorg-proto-resource,VERSION,$(XORG_PROTO_RESOURCE_VERSION))
+	@$(call install_fixup, xorg-proto-resource,SECTION,base)
+	@$(call install_fixup, xorg-proto-resource,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
+	@$(call install_fixup, xorg-proto-resource,DEPENDS,)
+	@$(call install_fixup, xorg-proto-resource,DESCRIPTION,missing)
+
+	@$(call install_finish, xorg-proto-resource)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-proto-scrnsaver.make b/rules/xorg-proto-scrnsaver.make
index 217f1069e..4ee08d186 100644
--- a/rules/xorg-proto-scrnsaver.make
+++ b/rules/xorg-proto-scrnsaver.make
@@ -106,16 +106,16 @@ xorg-proto-scrnsaver_targetinstall: $(STATEDIR)/xorg-proto-scrnsaver.targetinsta
 $(STATEDIR)/xorg-proto-scrnsaver.targetinstall: $(xorg-proto-scrnsaver_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-proto-scrnsaver)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_PROTO_SCRNSAVER_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-proto-scrnsaver)
+	@$(call install_fixup, xorg-proto-scrnsaver,PACKAGE,xorg-proto-scrnsaver)
+	@$(call install_fixup, xorg-proto-scrnsaver,PRIORITY,optional)
+	@$(call install_fixup, xorg-proto-scrnsaver,VERSION,$(XORG_PROTO_SCRNSAVER_VERSION))
+	@$(call install_fixup, xorg-proto-scrnsaver,SECTION,base)
+	@$(call install_fixup, xorg-proto-scrnsaver,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
+	@$(call install_fixup, xorg-proto-scrnsaver,DEPENDS,)
+	@$(call install_fixup, xorg-proto-scrnsaver,DESCRIPTION,missing)
+
+	@$(call install_finish, xorg-proto-scrnsaver)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-proto-trap.make b/rules/xorg-proto-trap.make
index a9de755c2..6b02604f7 100644
--- a/rules/xorg-proto-trap.make
+++ b/rules/xorg-proto-trap.make
@@ -106,16 +106,16 @@ xorg-proto-trap_targetinstall: $(STATEDIR)/xorg-proto-trap.targetinstall
 $(STATEDIR)/xorg-proto-trap.targetinstall: $(xorg-proto-trap_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-proto-trap)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_PROTO_TRAP_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-proto-trap)
+	@$(call install_fixup, xorg-proto-trap,PACKAGE,xorg-proto-trap)
+	@$(call install_fixup, xorg-proto-trap,PRIORITY,optional)
+	@$(call install_fixup, xorg-proto-trap,VERSION,$(XORG_PROTO_TRAP_VERSION))
+	@$(call install_fixup, xorg-proto-trap,SECTION,base)
+	@$(call install_fixup, xorg-proto-trap,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
+	@$(call install_fixup, xorg-proto-trap,DEPENDS,)
+	@$(call install_fixup, xorg-proto-trap,DESCRIPTION,missing)
+
+	@$(call install_finish, xorg-proto-trap)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-proto-video.make b/rules/xorg-proto-video.make
index 33dd083dc..4071ce60a 100644
--- a/rules/xorg-proto-video.make
+++ b/rules/xorg-proto-video.make
@@ -106,16 +106,16 @@ xorg-proto-video_targetinstall: $(STATEDIR)/xorg-proto-video.targetinstall
 $(STATEDIR)/xorg-proto-video.targetinstall: $(xorg-proto-video_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-proto-video)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_PROTO_VIDEO_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-proto-video)
+	@$(call install_fixup, xorg-proto-video,PACKAGE,xorg-proto-video)
+	@$(call install_fixup, xorg-proto-video,PRIORITY,optional)
+	@$(call install_fixup, xorg-proto-video,VERSION,$(XORG_PROTO_VIDEO_VERSION))
+	@$(call install_fixup, xorg-proto-video,SECTION,base)
+	@$(call install_fixup, xorg-proto-video,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
+	@$(call install_fixup, xorg-proto-video,DEPENDS,)
+	@$(call install_fixup, xorg-proto-video,DESCRIPTION,missing)
+
+	@$(call install_finish, xorg-proto-video)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-proto-windowswm.make b/rules/xorg-proto-windowswm.make
index d988b7c98..76683c834 100644
--- a/rules/xorg-proto-windowswm.make
+++ b/rules/xorg-proto-windowswm.make
@@ -106,16 +106,16 @@ xorg-proto-windowswm_targetinstall: $(STATEDIR)/xorg-proto-windowswm.targetinsta
 $(STATEDIR)/xorg-proto-windowswm.targetinstall: $(xorg-proto-windowswm_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-proto-windowswm)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_PROTO_WINDOWSWM_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-proto-windowswm)
+	@$(call install_fixup, xorg-proto-windowswm,PACKAGE,xorg-proto-windowswm)
+	@$(call install_fixup, xorg-proto-windowswm,PRIORITY,optional)
+	@$(call install_fixup, xorg-proto-windowswm,VERSION,$(XORG_PROTO_WINDOWSWM_VERSION))
+	@$(call install_fixup, xorg-proto-windowswm,SECTION,base)
+	@$(call install_fixup, xorg-proto-windowswm,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
+	@$(call install_fixup, xorg-proto-windowswm,DEPENDS,)
+	@$(call install_fixup, xorg-proto-windowswm,DESCRIPTION,missing)
+
+	@$(call install_finish, xorg-proto-windowswm)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-proto-x.make b/rules/xorg-proto-x.make
index 6d62121f2..6602c207a 100644
--- a/rules/xorg-proto-x.make
+++ b/rules/xorg-proto-x.make
@@ -106,16 +106,16 @@ xorg-proto-x_targetinstall: $(STATEDIR)/xorg-proto-x.targetinstall
 $(STATEDIR)/xorg-proto-x.targetinstall: $(xorg-proto-x_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-proto-x)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_PROTO_X_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-proto-x)
+	@$(call install_fixup, xorg-proto-x,PACKAGE,xorg-proto-x)
+	@$(call install_fixup, xorg-proto-x,PRIORITY,optional)
+	@$(call install_fixup, xorg-proto-x,VERSION,$(XORG_PROTO_X_VERSION))
+	@$(call install_fixup, xorg-proto-x,SECTION,base)
+	@$(call install_fixup, xorg-proto-x,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
+	@$(call install_fixup, xorg-proto-x,DEPENDS,)
+	@$(call install_fixup, xorg-proto-x,DESCRIPTION,missing)
+
+	@$(call install_finish, xorg-proto-x)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-proto-xcmisc.make b/rules/xorg-proto-xcmisc.make
index ea6390a73..3899dc96c 100644
--- a/rules/xorg-proto-xcmisc.make
+++ b/rules/xorg-proto-xcmisc.make
@@ -106,16 +106,16 @@ xorg-proto-xcmisc_targetinstall: $(STATEDIR)/xorg-proto-xcmisc.targetinstall
 $(STATEDIR)/xorg-proto-xcmisc.targetinstall: $(xorg-proto-xcmisc_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-proto-xcmisc)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_PROTO_XCMISC_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-proto-xcmisc)
+	@$(call install_fixup, xorg-proto-xcmisc,PACKAGE,xorg-proto-xcmisc)
+	@$(call install_fixup, xorg-proto-xcmisc,PRIORITY,optional)
+	@$(call install_fixup, xorg-proto-xcmisc,VERSION,$(XORG_PROTO_XCMISC_VERSION))
+	@$(call install_fixup, xorg-proto-xcmisc,SECTION,base)
+	@$(call install_fixup, xorg-proto-xcmisc,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
+	@$(call install_fixup, xorg-proto-xcmisc,DEPENDS,)
+	@$(call install_fixup, xorg-proto-xcmisc,DESCRIPTION,missing)
+
+	@$(call install_finish, xorg-proto-xcmisc)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-proto-xext.make b/rules/xorg-proto-xext.make
index 657eadeab..292dd886d 100644
--- a/rules/xorg-proto-xext.make
+++ b/rules/xorg-proto-xext.make
@@ -106,16 +106,16 @@ xorg-proto-xext_targetinstall: $(STATEDIR)/xorg-proto-xext.targetinstall
 $(STATEDIR)/xorg-proto-xext.targetinstall: $(xorg-proto-xext_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-proto-xext)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_PROTO_XEXT_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-proto-xext)
+	@$(call install_fixup, xorg-proto-xext,PACKAGE,xorg-proto-xext)
+	@$(call install_fixup, xorg-proto-xext,PRIORITY,optional)
+	@$(call install_fixup, xorg-proto-xext,VERSION,$(XORG_PROTO_XEXT_VERSION))
+	@$(call install_fixup, xorg-proto-xext,SECTION,base)
+	@$(call install_fixup, xorg-proto-xext,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
+	@$(call install_fixup, xorg-proto-xext,DEPENDS,)
+	@$(call install_fixup, xorg-proto-xext,DESCRIPTION,missing)
+
+	@$(call install_finish, xorg-proto-xext)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-proto-xf86bigfont.make b/rules/xorg-proto-xf86bigfont.make
index 4b3ae8a6d..fb6a63a37 100644
--- a/rules/xorg-proto-xf86bigfont.make
+++ b/rules/xorg-proto-xf86bigfont.make
@@ -106,16 +106,16 @@ xorg-proto-xf86bigfont_targetinstall: $(STATEDIR)/xorg-proto-xf86bigfont.targeti
 $(STATEDIR)/xorg-proto-xf86bigfont.targetinstall: $(xorg-proto-xf86bigfont_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-proto-xf86bigfont)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_PROTO_XF86BIGFONT_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-proto-xf86bigfont)
+	@$(call install_fixup, xorg-proto-xf86bigfont,PACKAGE,xorg-proto-xf86bigfont)
+	@$(call install_fixup, xorg-proto-xf86bigfont,PRIORITY,optional)
+	@$(call install_fixup, xorg-proto-xf86bigfont,VERSION,$(XORG_PROTO_XF86BIGFONT_VERSION))
+	@$(call install_fixup, xorg-proto-xf86bigfont,SECTION,base)
+	@$(call install_fixup, xorg-proto-xf86bigfont,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
+	@$(call install_fixup, xorg-proto-xf86bigfont,DEPENDS,)
+	@$(call install_fixup, xorg-proto-xf86bigfont,DESCRIPTION,missing)
+
+	@$(call install_finish, xorg-proto-xf86bigfont)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-proto-xf86dga.make b/rules/xorg-proto-xf86dga.make
index 4efa834aa..9fcf39036 100644
--- a/rules/xorg-proto-xf86dga.make
+++ b/rules/xorg-proto-xf86dga.make
@@ -106,16 +106,16 @@ xorg-proto-xf86dga_targetinstall: $(STATEDIR)/xorg-proto-xf86dga.targetinstall
 $(STATEDIR)/xorg-proto-xf86dga.targetinstall: $(xorg-proto-xf86dga_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-proto-xf86dga)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_PROTO_XF86DGA_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-proto-xf86dga)
+	@$(call install_fixup, xorg-proto-xf86dga,PACKAGE,xorg-proto-xf86dga)
+	@$(call install_fixup, xorg-proto-xf86dga,PRIORITY,optional)
+	@$(call install_fixup, xorg-proto-xf86dga,VERSION,$(XORG_PROTO_XF86DGA_VERSION))
+	@$(call install_fixup, xorg-proto-xf86dga,SECTION,base)
+	@$(call install_fixup, xorg-proto-xf86dga,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
+	@$(call install_fixup, xorg-proto-xf86dga,DEPENDS,)
+	@$(call install_fixup, xorg-proto-xf86dga,DESCRIPTION,missing)
+
+	@$(call install_finish, xorg-proto-xf86dga)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-proto-xf86dri.make b/rules/xorg-proto-xf86dri.make
index 28bbbdfe3..ea43580ee 100644
--- a/rules/xorg-proto-xf86dri.make
+++ b/rules/xorg-proto-xf86dri.make
@@ -106,16 +106,16 @@ xorg-proto-xf86dri_targetinstall: $(STATEDIR)/xorg-proto-xf86dri.targetinstall
 $(STATEDIR)/xorg-proto-xf86dri.targetinstall: $(xorg-proto-xf86dri_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-proto-xf86dri)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_PROTO_XF86DRI_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-proto-xf86dri)
+	@$(call install_fixup, xorg-proto-xf86dri,PACKAGE,xorg-proto-xf86dri)
+	@$(call install_fixup, xorg-proto-xf86dri,PRIORITY,optional)
+	@$(call install_fixup, xorg-proto-xf86dri,VERSION,$(XORG_PROTO_XF86DRI_VERSION))
+	@$(call install_fixup, xorg-proto-xf86dri,SECTION,base)
+	@$(call install_fixup, xorg-proto-xf86dri,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
+	@$(call install_fixup, xorg-proto-xf86dri,DEPENDS,)
+	@$(call install_fixup, xorg-proto-xf86dri,DESCRIPTION,missing)
+
+	@$(call install_finish, xorg-proto-xf86dri)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-proto-xf86misc.make b/rules/xorg-proto-xf86misc.make
index 6ab1eea81..13c8fdc68 100644
--- a/rules/xorg-proto-xf86misc.make
+++ b/rules/xorg-proto-xf86misc.make
@@ -106,16 +106,16 @@ xorg-proto-xf86misc_targetinstall: $(STATEDIR)/xorg-proto-xf86misc.targetinstall
 $(STATEDIR)/xorg-proto-xf86misc.targetinstall: $(xorg-proto-xf86misc_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-proto-xf86misc)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_PROTO_XF86MISC_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-proto-xf86misc)
+	@$(call install_fixup, xorg-proto-xf86misc,PACKAGE,xorg-proto-xf86misc)
+	@$(call install_fixup, xorg-proto-xf86misc,PRIORITY,optional)
+	@$(call install_fixup, xorg-proto-xf86misc,VERSION,$(XORG_PROTO_XF86MISC_VERSION))
+	@$(call install_fixup, xorg-proto-xf86misc,SECTION,base)
+	@$(call install_fixup, xorg-proto-xf86misc,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
+	@$(call install_fixup, xorg-proto-xf86misc,DEPENDS,)
+	@$(call install_fixup, xorg-proto-xf86misc,DESCRIPTION,missing)
+
+	@$(call install_finish, xorg-proto-xf86misc)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-proto-xf86rush.make b/rules/xorg-proto-xf86rush.make
index cb257d9c7..e4e2689a1 100644
--- a/rules/xorg-proto-xf86rush.make
+++ b/rules/xorg-proto-xf86rush.make
@@ -106,16 +106,16 @@ xorg-proto-xf86rush_targetinstall: $(STATEDIR)/xorg-proto-xf86rush.targetinstall
 $(STATEDIR)/xorg-proto-xf86rush.targetinstall: $(xorg-proto-xf86rush_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-proto-xf86rush)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_PROTO_XF86RUSH_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-proto-xf86rush)
+	@$(call install_fixup, xorg-proto-xf86rush,PACKAGE,xorg-proto-xf86rush)
+	@$(call install_fixup, xorg-proto-xf86rush,PRIORITY,optional)
+	@$(call install_fixup, xorg-proto-xf86rush,VERSION,$(XORG_PROTO_XF86RUSH_VERSION))
+	@$(call install_fixup, xorg-proto-xf86rush,SECTION,base)
+	@$(call install_fixup, xorg-proto-xf86rush,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
+	@$(call install_fixup, xorg-proto-xf86rush,DEPENDS,)
+	@$(call install_fixup, xorg-proto-xf86rush,DESCRIPTION,missing)
+
+	@$(call install_finish, xorg-proto-xf86rush)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-proto-xf86vidmode.make b/rules/xorg-proto-xf86vidmode.make
index 0c75c5c2a..eddd49ee4 100644
--- a/rules/xorg-proto-xf86vidmode.make
+++ b/rules/xorg-proto-xf86vidmode.make
@@ -106,16 +106,16 @@ xorg-proto-xf86vidmode_targetinstall: $(STATEDIR)/xorg-proto-xf86vidmode.targeti
 $(STATEDIR)/xorg-proto-xf86vidmode.targetinstall: $(xorg-proto-xf86vidmode_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-proto-xf86vidmode)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_PROTO_XF86VIDMODE_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-proto-xf86vidmode)
+	@$(call install_fixup, xorg-proto-xf86vidmode,PACKAGE,xorg-proto-xf86vidmode)
+	@$(call install_fixup, xorg-proto-xf86vidmode,PRIORITY,optional)
+	@$(call install_fixup, xorg-proto-xf86vidmode,VERSION,$(XORG_PROTO_XF86VIDMODE_VERSION))
+	@$(call install_fixup, xorg-proto-xf86vidmode,SECTION,base)
+	@$(call install_fixup, xorg-proto-xf86vidmode,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
+	@$(call install_fixup, xorg-proto-xf86vidmode,DEPENDS,)
+	@$(call install_fixup, xorg-proto-xf86vidmode,DESCRIPTION,missing)
+
+	@$(call install_finish, xorg-proto-xf86vidmode)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-proto-xinerama.make b/rules/xorg-proto-xinerama.make
index ae94d301c..d0145137f 100644
--- a/rules/xorg-proto-xinerama.make
+++ b/rules/xorg-proto-xinerama.make
@@ -106,16 +106,16 @@ xorg-proto-xinerama_targetinstall: $(STATEDIR)/xorg-proto-xinerama.targetinstall
 $(STATEDIR)/xorg-proto-xinerama.targetinstall: $(xorg-proto-xinerama_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-proto-xinerama)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_PROTO_XINERAMA_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-proto-xinerama)
+	@$(call install_fixup, xorg-proto-xinerama,PACKAGE,xorg-proto-xinerama)
+	@$(call install_fixup, xorg-proto-xinerama,PRIORITY,optional)
+	@$(call install_fixup, xorg-proto-xinerama,VERSION,$(XORG_PROTO_XINERAMA_VERSION))
+	@$(call install_fixup, xorg-proto-xinerama,SECTION,base)
+	@$(call install_fixup, xorg-proto-xinerama,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
+	@$(call install_fixup, xorg-proto-xinerama,DEPENDS,)
+	@$(call install_fixup, xorg-proto-xinerama,DESCRIPTION,missing)
+
+	@$(call install_finish, xorg-proto-xinerama)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-proto-xproxymanagement.make b/rules/xorg-proto-xproxymanagement.make
index c194a73db..78d6bbbe4 100644
--- a/rules/xorg-proto-xproxymanagement.make
+++ b/rules/xorg-proto-xproxymanagement.make
@@ -106,16 +106,16 @@ xorg-proto-xproxymanagement_targetinstall: $(STATEDIR)/xorg-proto-xproxymanageme
 $(STATEDIR)/xorg-proto-xproxymanagement.targetinstall: $(xorg-proto-xproxymanagement_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-proto-xproxymanagement)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_PROTO_XPROXYMANAGEMENT_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_finish)
+	@$(call install_init, xorg-proto-xproxymanagement)
+	@$(call install_fixup, xorg-proto-xproxymanagement,PACKAGE,xorg-proto-xproxymanagement)
+	@$(call install_fixup, xorg-proto-xproxymanagement,PRIORITY,optional)
+	@$(call install_fixup, xorg-proto-xproxymanagement,VERSION,$(XORG_PROTO_XPROXYMANAGEMENT_VERSION))
+	@$(call install_fixup, xorg-proto-xproxymanagement,SECTION,base)
+	@$(call install_fixup, xorg-proto-xproxymanagement,AUTHOR,"Erwin Rol <erwin\@erwinrol.com>")
+	@$(call install_fixup, xorg-proto-xproxymanagement,DEPENDS,)
+	@$(call install_fixup, xorg-proto-xproxymanagement,DESCRIPTION,missing)
+
+	@$(call install_finish, xorg-proto-xproxymanagement)
 
 	@$(call touch, $@)
 
diff --git a/rules/xorg-server.make b/rules/xorg-server.make
index c6b6726c3..bc95e20c2 100644
--- a/rules/xorg-server.make
+++ b/rules/xorg-server.make
@@ -336,42 +336,42 @@ xorg-server_targetinstall: $(STATEDIR)/xorg-server.targetinstall
 $(STATEDIR)/xorg-server.targetinstall: $(xorg-server_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xorg-server)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(XORG_SERVER_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
+	@$(call install_init, xorg-server)
+	@$(call install_fixup, xorg-server,PACKAGE,xorg-server)
+	@$(call install_fixup, xorg-server,PRIORITY,optional)
+	@$(call install_fixup, xorg-server,VERSION,$(XORG_SERVER_VERSION))
+	@$(call install_fixup, xorg-server,SECTION,base)
+	@$(call install_fixup, xorg-server,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, xorg-server,DEPENDS,)
+	@$(call install_fixup, xorg-server,DESCRIPTION,missing)
 
 ifdef PTXCONF_XORG_SERVER_XVFB
-	@$(call install_copy, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/vfb/Xvfb, $(XORG_PREFIX)/bin/Xvfb)
+	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/vfb/Xvfb, $(XORG_PREFIX)/bin/Xvfb)
 endif
 ifdef PTXCONF_XORG_SERVER_XORG
-	@$(call install_copy, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/Xorg, $(XORG_PREFIX)/bin/Xorg)
+	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/Xorg, $(XORG_PREFIX)/bin/Xorg)
 endif
 ifdef PTXCONF_XORG_SERVER_DMX
-	@$(call install_copy, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/dmx/Xdmx, $(XORG_PREFIX)/bin/Xdmx)
+	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/dmx/Xdmx, $(XORG_PREFIX)/bin/Xdmx)
 endif
 ifdef PTXCONF_XORG_SERVER_XNEST
-	@$(call install_copy, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xnest/Xnest, $(XORG_PREFIX)/bin/Xnest)
+	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xnest/Xnest, $(XORG_PREFIX)/bin/Xnest)
 endif
 ifdef PTXCONF_XORG_SERVER_XPRINT
 endif
 ifdef PTXCONF_XORG_SERVER_XWIN
-	@$(call install_copy, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xwin/Xwin, $(XORG_PREFIX)/bin/Xwin)
+	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xwin/Xwin, $(XORG_PREFIX)/bin/Xwin)
 endif
 ifdef PTXCONF_XORG_DRIVER_VIDEO_FBDEV
-	@$(call install_copy, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/fbdevhw/.libs/libfbdevhw.so, $(XORG_PREFIX)/lib/xorg/modules/libfbdevhw.so)
-	@$(call install_copy, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libfb.so, $(XORG_PREFIX)/lib/xorg/modules/libfb.so)
+	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/fbdevhw/.libs/libfbdevhw.so, $(XORG_PREFIX)/lib/xorg/modules/libfbdevhw.so)
+	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libfb.so, $(XORG_PREFIX)/lib/xorg/modules/libfb.so)
 endif
 
-	@$(call install_copy, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libbitmap.so, $(XORG_PREFIX)/lib/xorg/modules/libbitmap.so)
-	@$(call install_copy, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/scanpci/.libs/libpcidata.so, $(XORG_PREFIX)/lib/xorg/modules/libpcidata.so)
-	@$(call install_copy, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libshadow.so, $(XORG_PREFIX)/lib/xorg/modules/libshadow.so)
+	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libbitmap.so, $(XORG_PREFIX)/lib/xorg/modules/libbitmap.so)
+	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/scanpci/.libs/libpcidata.so, $(XORG_PREFIX)/lib/xorg/modules/libpcidata.so)
+	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libshadow.so, $(XORG_PREFIX)/lib/xorg/modules/libshadow.so)
 
-	@$(call install_finish)
+	@$(call install_finish, xorg-server)
 
 	@$(call touch, $@)
 
diff --git a/rules/xvkbd.make b/rules/xvkbd.make
index e3c224bed..426e55b92 100644
--- a/rules/xvkbd.make
+++ b/rules/xvkbd.make
@@ -99,23 +99,23 @@ xvkbd_targetinstall: $(STATEDIR)/xvkbd.targetinstall
 $(STATEDIR)/xvkbd.targetinstall: $(xvkbd_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,xvkbd)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(COREUTILS_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0755, $(XVKBD_DIR)/xvkbd, /usr/X11R6/bin/xvkbd)
-	@$(call install_copy, 0, 0, 0755, $(XVKBD_DIR)/XVkbd-common.ad, /etc/X11/app-defaults/XVkbd-common)
-	@$(call install_copy, 0, 0, 0755, $(XVKBD_DIR)/XVkbd-german.ad, /etc/X11/app-defaults/XVkbd-german)
+	@$(call install_init, xvkbd)
+	@$(call install_fixup, xvkbd,PACKAGE,xvkbd)
+	@$(call install_fixup, xvkbd,PRIORITY,optional)
+	@$(call install_fixup, xvkbd,VERSION,$(COREUTILS_VERSION))
+	@$(call install_fixup, xvkbd,SECTION,base)
+	@$(call install_fixup, xvkbd,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, xvkbd,DEPENDS,)
+	@$(call install_fixup, xvkbd,DESCRIPTION,missing)
+
+	@$(call install_copy, xvkbd, 0, 0, 0755, $(XVKBD_DIR)/xvkbd, /usr/X11R6/bin/xvkbd)
+	@$(call install_copy, xvkbd, 0, 0, 0755, $(XVKBD_DIR)/XVkbd-common.ad, /etc/X11/app-defaults/XVkbd-common)
+	@$(call install_copy, xvkbd, 0, 0, 0755, $(XVKBD_DIR)/XVkbd-german.ad, /etc/X11/app-defaults/XVkbd-german)
 	echo '#include "XVkbd-german"' > $(ROOTDIR)/etc/X11/app-defaults/XVkbd
 	# FIXME: fix permissions
 	echo '#include "XVkbd-german"' > $(IMAGEIR)/ipkg/etc/X11/app-defaults/XVkbd
 
-	@$(call install_finish)
+	@$(call install_finish, xvkbd)
 	
 	@$(call touch, $@)
 
diff --git a/rules/zlib.make b/rules/zlib.make
index b09467a04..70f5f1b39 100644
--- a/rules/zlib.make
+++ b/rules/zlib.make
@@ -99,20 +99,20 @@ zlib_targetinstall: $(STATEDIR)/zlib.targetinstall
 $(STATEDIR)/zlib.targetinstall: $(zlib_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,default)
-	@$(call install_fixup,PACKAGE,zlib)
-	@$(call install_fixup,PRIORITY,optional)
-	@$(call install_fixup,VERSION,$(ZLIB_VERSION))
-	@$(call install_fixup,SECTION,base)
-	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,DEPENDS,)
-	@$(call install_fixup,DESCRIPTION,missing)
-
-	@$(call install_copy, 0, 0, 0644, $(ZLIB_DIR)/libz.so.1.2.3, /usr/lib/libz.so.1.2.3)
-	@$(call install_link, libz.so.1.2.3, /usr/lib/libz.so.1)
-	@$(call install_link, libz.so.1.2.3, /usr/lib/libz.so)
-
-	@$(call install_finish)
+	@$(call install_init, zlib)
+	@$(call install_fixup, zlib,PACKAGE,zlib)
+	@$(call install_fixup, zlib,PRIORITY,optional)
+	@$(call install_fixup, zlib,VERSION,$(ZLIB_VERSION))
+	@$(call install_fixup, zlib,SECTION,base)
+	@$(call install_fixup, zlib,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, zlib,DEPENDS,)
+	@$(call install_fixup, zlib,DESCRIPTION,missing)
+
+	@$(call install_copy, zlib, 0, 0, 0644, $(ZLIB_DIR)/libz.so.1.2.3, /usr/lib/libz.so.1.2.3)
+	@$(call install_link, zlib, libz.so.1.2.3, /usr/lib/libz.so.1)
+	@$(call install_link, zlib, libz.so.1.2.3, /usr/lib/libz.so)
+
+	@$(call install_finish, zlib)
 
 	@$(call touch, $@)
author	Sascha Hauer <s.hauer@pengutronix.de>	2006-02-24 17:34:58 +0000
committer	Sascha Hauer <s.hauer@pengutronix.de>	2006-02-24 17:34:58 +0000
commit	d008f7b7bc5a55dfb86ae421903af76ee901c530 (patch)
tree	4b2679948d102974dd560134acfd1b7012626f6a /rules
parent	19780c394ec957f9cd4b46ca2fb35c004d647bda (diff)
download	ptxdist-d008f7b7bc5a55dfb86ae421903af76ee901c530.tar.gz ptxdist-d008f7b7bc5a55dfb86ae421903af76ee901c530.tar.xz