[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-changelog] [xen master] flask: use DESTDIR directly in install target rules



commit 8f34f515673c46a0a3453e249f67bfd3bf09a5f6
Author:     Vadim A. Misbakh-Soloviov <mva@xxxxxxxx>
AuthorDate: Tue Jul 30 16:34:40 2013 +0400
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Fri Aug 2 15:43:15 2013 +0100

    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@xxxxxxxx>
    Acked-by: Daniel De Graaf <dgdegra@xxxxxxxxxxxxx>
---
 tools/flask/policy/Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/flask/policy/Makefile b/tools/flask/policy/Makefile
index df1e8f3..a1c0f11 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 $@
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.