From: Vadim A. Misbakh-Soloviov Date: Tue, 30 Jul 2013 12:34:40 +0000 (+0400) Subject: flask: use DESTDIR directly in install target rules X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~6576 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8f34f515673c46a0a3453e249f67bfd3bf09a5f6;p=xen.git 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 Acked-by: Daniel De Graaf --- diff --git a/tools/flask/policy/Makefile b/tools/flask/policy/Makefile index df1e8f3fdc..a1c0f11fad 100644 --- 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 $@