[selinux-policy: 1618/3172] fix makefile to install root default contexts

[Daniel J Walsh]

commit 8a2492a2dfcc851422173fa92aa25c5a1eb2f348
Author: Chris PeBenito <cpebenito at tresys.com>
Date:   Thu Oct 12 13:18:21 2006 +0000

    fix makefile to install root default contexts

 Makefile |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/Makefile b/Makefile
index 2f89157..920e128 100644
--- a/Makefile
+++ b/Makefile
@@ -241,7 +241,9 @@ endif
 appconf := config/appconfig-$(TYPE)
 seusers := $(appconf)/seusers
 appdir := $(contextpath)
-appfiles := $(addprefix $(appdir)/,default_contexts default_type initrc_context failsafe_context userhelper_context removable_context dbus_contexts customizable_types) $(contextpath)/files/media
+user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts)
+user_default_contexts_names := $(addprefix $(contextpath)/users/,$(subst _default_contexts,,$(notdir $(user_default_contexts))))
+appfiles := $(addprefix $(appdir)/,default_contexts default_type initrc_context failsafe_context userhelper_context removable_context dbus_contexts customizable_types) $(contextpath)/files/media $(user_default_contexts_names)
 net_contexts := $(builddir)net_contexts
 
 all_layers := $(filter-out $(moddir)/CVS,$(shell find $(wildcard $(moddir)/*) -maxdepth 0 -type d))
@@ -512,9 +514,9 @@ $(appdir)/dbus_contexts: $(appconf)/dbus_contexts
 	@mkdir -p $(appdir)
 	$(verbose) $(INSTALL) -m 644 $< $@
 
-$(appdir)/users/root: $(appconf)/root_default_contexts
+$(contextpath)/users/%: $(appconf)/%_default_contexts
 	@mkdir -p $(appdir)/users
-	$(verbose) $(INSTALL) -m 644 $< $@
+	$(verbose) $(INSTALL) -m 644 $^ $@
 
 ########################################
 #