flask: use DESTDIR directly in install target rules

30.07.2013 13:51, Ian Campbell wrote:
> I think it would be a bit less surprising for drive by patchers etc to
> remove the DESTDIR from POLICY_LOADPATH and add it to the install
> target, which is the usual way to do things. Up to you/Vadim though.

Signed-off-by: Vadim A. Misbakh-Soloviov <mva@mva.name>
Acked-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>

diff --git a/tools/flask/policy/Makefile b/tools/flask/policy/Makefile
index df1e8f3fdc322a97eb950e38dd79f5562ba769fc..a1c0f11fad63d9b5ff6df9dc189b755fad5384e5 100644 (file)
--- a/tools/flask/policy/Makefile
+++ b/tools/flask/policy/Makefile
@@ -33,7 +33,7 @@ M4 ?= m4
 OUTPUT_POLICY = 24
 
 POLICY_FILENAME = xenpolicy.$(OUTPUT_POLICY)
-POLICY_LOADPATH = $(DESTDIR)/boot
+POLICY_LOADPATH = /boot
 
 # policy source layout
 POLDIR := policy
@@ -103,8 +103,8 @@ POLICY_SECTIONS += $(USERS) $(CONSTRAINTS) $(ISID_DEFS)
 all: $(POLICY_FILENAME)
 
 install: $(POLICY_FILENAME)
-       $(INSTALL_DIR) $(POLICY_LOADPATH)
-       $(INSTALL_DATA) $^ $(POLICY_LOADPATH)
+       $(INSTALL_DIR) $(DESTDIR)/$(POLICY_LOADPATH)
+       $(INSTALL_DATA) $^ $(DESTDIR)/$(POLICY_LOADPATH)
 
 $(POLICY_FILENAME): policy.conf
        $(CHECKPOLICY) $(CHECKPOLICY_PARAM) $^ -o $@