[selinux-policy: 1888/3172] trunk: simplify appconfig file installation.

Daniel J Walsh dwalsh at fedoraproject.org
Thu Oct 7 21:48:13 UTC 2010


commit b23e1c1c17cd4bcaa8bb7217d8af6950680f5643
Author: Chris PeBenito <cpebenito at tresys.com>
Date:   Thu Jan 17 14:10:36 2008 +0000

    trunk: simplify appconfig file installation.

 Makefile |   32 ++++----------------------------
 1 files changed, 4 insertions(+), 28 deletions(-)
---
diff --git a/Makefile b/Makefile
index df6806e..1a9b611 100644
--- a/Makefile
+++ b/Makefile
@@ -513,38 +513,14 @@ $(contextpath)/files/media: $(appconf)/media
 	@mkdir -p $(contextpath)/files/
 	$(verbose) $(INSTALL) -m 644 $< $@
 
-$(appdir)/default_contexts: $(appconf)/default_contexts
-	@mkdir -p $(appdir)
-	$(verbose) $(INSTALL) -m 644 $< $@
-
-$(appdir)/removable_context: $(appconf)/removable_context
-	@mkdir -p $(appdir)
-	$(verbose) $(INSTALL) -m 644 $< $@
-
-$(appdir)/default_type: $(appconf)/default_type
-	@mkdir -p $(appdir)
-	$(verbose) $(INSTALL) -m 644 $< $@
-
-$(appdir)/userhelper_context: $(appconf)/userhelper_context
-	@mkdir -p $(appdir)
-	$(verbose) $(INSTALL) -m 644 $< $@
-
-$(appdir)/initrc_context: $(tmpdir)/initrc_context
-	@mkdir -p $(appdir)
-	$(verbose) $(INSTALL) -m 644 $< $@
-
-$(appdir)/failsafe_context: $(appconf)/failsafe_context
-	@mkdir -p $(appdir)
-	$(verbose) $(INSTALL) -m 644 $< $@
-
-$(appdir)/dbus_contexts: $(appconf)/dbus_contexts
-	@mkdir -p $(appdir)
-	$(verbose) $(INSTALL) -m 644 $< $@
-
 $(contextpath)/users/%: $(appconf)/%_default_contexts
 	@mkdir -p $(appdir)/users
 	$(verbose) $(INSTALL) -m 644 $^ $@
 
+$(appdir)/%: $(appconf)/%
+	@mkdir -p $(appdir)
+	$(verbose) $(INSTALL) -m 644 $< $@
+
 ########################################
 #
 # Install policy headers


More information about the scm-commits mailing list