aboutsummaryrefslogtreecommitdiffstats
path: root/tools/security
diff options
context:
space:
mode:
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>2007-03-07 10:49:20 +0000
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>2007-03-07 10:49:20 +0000
commit9de4f0c67def5ab75c4f5a9a4428b719e149e8b2 (patch)
treeb4cb36609da6cee29432b58dfc37c6b8dcf917be /tools/security
parentd4ac34aff9f66f57c164120ba5daf74109b35e91 (diff)
downloadxen-9de4f0c67def5ab75c4f5a9a4428b719e149e8b2.tar.gz
xen-9de4f0c67def5ab75c4f5a9a4428b719e149e8b2.tar.bz2
xen-9de4f0c67def5ab75c4f5a9a4428b719e149e8b2.zip
tools: Clean up use of 'install' command.
- convert raw "install" command to use $(INSTALL) - convert some $(INSTALL) to $(INSTALL_DATA) as appropriate - modify the specific $(INSTALL) definitions to use -p. Original patch by Ben Thomas <ben@virtualiron.com> Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'tools/security')
-rw-r--r--tools/security/Makefile30
1 files changed, 15 insertions, 15 deletions
diff --git a/tools/security/Makefile b/tools/security/Makefile
index 289ddd2bf1..d4cc1b9b95 100644
--- a/tools/security/Makefile
+++ b/tools/security/Makefile
@@ -58,23 +58,23 @@ ifndef XEN_PYTHON_NATIVE_INSTALL
install: LIBPATH=$(shell PYTHONPATH=../python/xen/util python -c "import auxbin; print auxbin.libpath()")
endif
install: all $(ACM_CONFIG_FILE)
- $(INSTALL_DIR) -p $(DESTDIR)/usr/sbin
- $(INSTALL_PROG) -p $(ACM_INST_TOOLS) $(DESTDIR)/usr/sbin
- $(INSTALL_PROG) -p $(ACM_EZPOLICY) $(DESTDIR)/usr/sbin
- $(INSTALL_DIR) -p $(DESTDIR)$(ACM_CONFIG_DIR)
- $(INSTALL_DIR) -p $(DESTDIR)$(ACM_POLICY_DIR)
- $(INSTALL_DATA) -p policies/$(ACM_SCHEMA) $(DESTDIR)$(ACM_POLICY_DIR)
- $(INSTALL_DIR) -p $(DESTDIR)$(ACM_POLICY_DIR)/example
+ $(INSTALL_DIR) $(DESTDIR)/usr/sbin
+ $(INSTALL_PROG) $(ACM_INST_TOOLS) $(DESTDIR)/usr/sbin
+ $(INSTALL_PROG) $(ACM_EZPOLICY) $(DESTDIR)/usr/sbin
+ $(INSTALL_DIR) $(DESTDIR)$(ACM_CONFIG_DIR)
+ $(INSTALL_DIR) $(DESTDIR)$(ACM_POLICY_DIR)
+ $(INSTALL_DATA) policies/$(ACM_SCHEMA) $(DESTDIR)$(ACM_POLICY_DIR)
+ $(INSTALL_DIR) $(DESTDIR)$(ACM_POLICY_DIR)/example
for i in $(ACM_EXAMPLES); do \
- $(INSTALL_DIR) -p $(DESTDIR)$(ACM_POLICY_DIR)/example/$$i; \
- $(INSTALL_DATA) -p policies/example/$$i/client_v1-$(ACM_POLICY_SUFFIX) $(DESTDIR)$(ACM_POLICY_DIR)/example/$$i; \
+ $(INSTALL_DIR) $(DESTDIR)$(ACM_POLICY_DIR)/example/$$i; \
+ $(INSTALL_DATA) policies/example/$$i/client_v1-$(ACM_POLICY_SUFFIX) $(DESTDIR)$(ACM_POLICY_DIR)/example/$$i; \
done
- $(INSTALL_DIR) -p $(DESTDIR)$(ACM_SCRIPT_DIR)
- $(INSTALL_PROG) -p $(ACM_SCRIPTS) $(DESTDIR)$(ACM_SCRIPT_DIR)
- $(INSTALL_DIR) -p $(DESTDIR)$(ACM_SECGEN_HTMLDIR)
- $(INSTALL_DATA) -p $(ACM_INST_HTML) $(DESTDIR)$(ACM_SECGEN_HTMLDIR)
- $(INSTALL_DIR) -p $(DESTDIR)$(ACM_SECGEN_CGIDIR)
- $(INSTALL_PROG) -p $(ACM_INST_CGI) $(DESTDIR)$(ACM_SECGEN_CGIDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(ACM_SCRIPT_DIR)
+ $(INSTALL_PROG) $(ACM_SCRIPTS) $(DESTDIR)$(ACM_SCRIPT_DIR)
+ $(INSTALL_DIR) $(DESTDIR)$(ACM_SECGEN_HTMLDIR)
+ $(INSTALL_DATA) $(ACM_INST_HTML) $(DESTDIR)$(ACM_SECGEN_HTMLDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(ACM_SECGEN_CGIDIR)
+ $(INSTALL_PROG) $(ACM_INST_CGI) $(DESTDIR)$(ACM_SECGEN_CGIDIR)
ifndef XEN_PYTHON_NATIVE_INSTALL
python python/setup.py install --home="$(DESTDIR)/usr" --install-lib="$(DESTDIR)$(LIBPATH)/python"
else