From 1fb83a764b704e982f5ce3d367bd58c8696be6e3 Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Thu, 22 Sep 2005 14:31:30 +0000 Subject: [PATCH] fix system.users now that the gen_user macro is in support --- refpolicy/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/refpolicy/Makefile b/refpolicy/Makefile index a03a9fd8..b29bb9ee 100644 --- a/refpolicy/Makefile +++ b/refpolicy/Makefile @@ -266,7 +266,7 @@ html: $(POLXML) # # Runtime binary policy patching of users # -$(USERPATH)/system.users: $(USER_FILES) tmp/generated_definitions.conf +$(USERPATH)/system.users: $(M4SUPPORT) tmp/generated_definitions.conf $(USER_FILES) @mkdir -p $(USERPATH) @echo "Installing system.users" @echo "# " > tmp/system.users @@ -274,7 +274,7 @@ $(USERPATH)/system.users: $(USER_FILES) tmp/generated_definitions.conf @echo "# This file is replaced on reinstalls of this policy." >> tmp/system.users @echo "# Please edit local.users to make local changes." >> tmp/system.users @echo "#" >> tmp/system.users - $(QUIET) m4 -D self_contained_policy $(M4PARAM) tmp/generated_definitions.conf $(USER_FILES) | \ + $(QUIET) m4 -D self_contained_policy $(M4PARAM) $^ | \ egrep -v "^[[:space:]]*($$|#)" >> tmp/system.users $(QUIET) install -m 644 tmp/system.users $@