WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 		  
Home Products Support Community News
 
   
 

xen-changelog

[Top] [All Lists]
<prev [Date] next>
[Advanced]
 <prev [Thread] next>

[Xen-changelog] [xen-unstable] tools: Clean up use of 'install' command.

from [Xen patchbot-unstable] [Permanent Link][Original]
To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] tools: Clean up use of 'install' command.
From: Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Wed, 07 Mar 2007 11:31:15 -0800
Delivery-date: Wed, 07 Mar 2007 11:33:45 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx 
# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1173264560 0
# Node ID 9be942ec0247a20f4d6b9dacc53fd85582688df5
# Parent  c85d83074b54218aae7678c53cea02a21a49cec7
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@xxxxxxxxxxxxxxx>
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 config/StdGNU.mk             |    6 +++---
 config/SunOS.mk              |    6 +++---
 tools/Makefile               |    4 ++--
 tools/blktap/lib/Makefile    |    4 ++--
 tools/console/Makefile       |    4 ++--
 tools/guest-headers/Makefile |    2 +-
 tools/ioemu/Makefile         |    8 ++++----
 tools/libxen/Makefile        |    4 ++--
 tools/pygrub/Makefile        |    4 ++--
 tools/security/Makefile      |   30 +++++++++++++++---------------
 tools/vnet/libxutil/Makefile |    2 +-
 tools/xenfb/Makefile         |    9 +++------
 tools/xenstore/Makefile      |   12 ++++++------
 13 files changed, 46 insertions(+), 49 deletions(-)

diff -r c85d83074b54 -r 9be942ec0247 config/StdGNU.mk
--- a/config/StdGNU.mk  Wed Mar 07 10:37:05 2007 +0000
+++ b/config/StdGNU.mk  Wed Mar 07 10:49:20 2007 +0000
@@ -12,9 +12,9 @@ MSGFMT     = msgfmt
 MSGFMT     = msgfmt
 
 INSTALL      = install
-INSTALL_DIR  = $(INSTALL) -d -m0755
-INSTALL_DATA = $(INSTALL) -m0644
-INSTALL_PROG = $(INSTALL) -m0755
+INSTALL_DIR  = $(INSTALL) -d -m0755 -p
+INSTALL_DATA = $(INSTALL) -m0644 -p
+INSTALL_PROG = $(INSTALL) -m0755 -p
 
 LIB64DIR = lib64
 
diff -r c85d83074b54 -r 9be942ec0247 config/SunOS.mk
--- a/config/SunOS.mk   Wed Mar 07 10:37:05 2007 +0000
+++ b/config/SunOS.mk   Wed Mar 07 10:49:20 2007 +0000
@@ -14,9 +14,9 @@ SHELL      = bash
 SHELL      = bash
 
 INSTALL      = ginstall
-INSTALL_DIR  = $(INSTALL) -d -m0755
-INSTALL_DATA = $(INSTALL) -m0644
-INSTALL_PROG = $(INSTALL) -m0755
+INSTALL_DIR  = $(INSTALL) -d -m0755 -p
+INSTALL_DATA = $(INSTALL) -m0644 -p
+INSTALL_PROG = $(INSTALL) -m0755 -p
 
 LIB64DIR = lib/amd64
 
diff -r c85d83074b54 -r 9be942ec0247 tools/Makefile
--- a/tools/Makefile    Wed Mar 07 10:37:05 2007 +0000
+++ b/tools/Makefile    Wed Mar 07 10:49:20 2007 +0000
@@ -41,8 +41,8 @@ install: check
                $(MAKE) -C $$subdir $@; \
        done
        $(MAKE) ioemuinstall
-       $(INSTALL_DIR) -p $(DESTDIR)/var/xen/dump
-       $(INSTALL_DIR) -p $(DESTDIR)/var/log/xen
+       $(INSTALL_DIR) $(DESTDIR)/var/xen/dump
+       $(INSTALL_DIR) $(DESTDIR)/var/log/xen
 
 .PHONY: clean
 clean: check_clean
diff -r c85d83074b54 -r 9be942ec0247 tools/blktap/lib/Makefile
--- a/tools/blktap/lib/Makefile Wed Mar 07 10:37:05 2007 +0000
+++ b/tools/blktap/lib/Makefile Wed Mar 07 10:49:20 2007 +0000
@@ -40,8 +40,8 @@ libblktap: libblktap.a
 libblktap: libblktap.a
 
 install: all
-       $(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)
-       $(INSTALL_DIR) -p $(DESTDIR)/usr/include
+       $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
+       $(INSTALL_DIR) $(DESTDIR)/usr/include
        $(INSTALL_PROG) $(LIB) $(DESTDIR)/usr/$(LIBDIR)
        ln -sf libblktap.so.$(MAJOR).$(MINOR) 
$(DESTDIR)/usr/$(LIBDIR)/libblktap.so.$(MAJOR)
        ln -sf libblktap.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libblktap.so
diff -r c85d83074b54 -r 9be942ec0247 tools/console/Makefile
--- a/tools/console/Makefile    Wed Mar 07 10:37:05 2007 +0000
+++ b/tools/console/Makefile    Wed Mar 07 10:49:20 2007 +0000
@@ -30,7 +30,7 @@ xenconsole: $(patsubst %.c,%.o,$(wildcar
 
 .PHONY: install
 install: $(BIN)
-       $(INSTALL_DIR) -p $(DESTDIR)/$(DAEMON_INSTALL_DIR)
+       $(INSTALL_DIR) $(DESTDIR)/$(DAEMON_INSTALL_DIR)
        $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(DAEMON_INSTALL_DIR)
-       $(INSTALL_DIR) -p $(DESTDIR)/$(CLIENT_INSTALL_DIR)
+       $(INSTALL_DIR) $(DESTDIR)/$(CLIENT_INSTALL_DIR)
        $(INSTALL_PROG) xenconsole $(DESTDIR)/$(CLIENT_INSTALL_DIR)
diff -r c85d83074b54 -r 9be942ec0247 tools/guest-headers/Makefile
--- a/tools/guest-headers/Makefile      Wed Mar 07 10:37:05 2007 +0000
+++ b/tools/guest-headers/Makefile      Wed Mar 07 10:49:20 2007 +0000
@@ -13,7 +13,7 @@ check:
 
 install-Linux:
        mkdir -p $(DESTDIR)/usr/include/xen/linux
-       install -m0644 $(linuxsparsetree)/include/xen/public/*.h 
$(DESTDIR)/usr/include/xen/linux
+       $(INSTALL_DATA) $(linuxsparsetree)/include/xen/public/*.h 
$(DESTDIR)/usr/include/xen/linux
 
 install-SunOS:
 
diff -r c85d83074b54 -r 9be942ec0247 tools/ioemu/Makefile
--- a/tools/ioemu/Makefile      Wed Mar 07 10:37:05 2007 +0000
+++ b/tools/ioemu/Makefile      Wed Mar 07 10:49:20 2007 +0000
@@ -65,10 +65,10 @@ common  de-ch  es     fo  fr-ca  hu     
 
 install-doc: $(DOCS)
        mkdir -p "$(DESTDIR)$(docdir)"
-       $(INSTALL) -m 644 qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"
+       $(INSTALL_DATA) qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"
 ifndef CONFIG_WIN32
        mkdir -p "$(DESTDIR)$(mandir)/man1"
-       $(INSTALL) qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"
+       $(INSTALL_DATA) qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"
 endif
 
 install: all $(if $(BUILD_DOCS),install-doc)
@@ -77,12 +77,12 @@ install: all $(if $(BUILD_DOCS),install-
 #      mkdir -p "$(DESTDIR)$(datadir)"
 #      for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
 #                      video.x openbios-sparc32 linux_boot.bin; do \
-#              $(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x 
"$(DESTDIR)$(datadir)"; \
+#              $(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; 
\
 #      done
 ifndef CONFIG_WIN32
        mkdir -p "$(DESTDIR)$(datadir)/keymaps"
        for x in $(KEYMAPS); do \
-               $(INSTALL) -m 644 $(SRC_PATH)/keymaps/$$x 
"$(DESTDIR)$(datadir)/keymaps"; \
+               $(INSTALL_DATA) $(SRC_PATH)/keymaps/$$x 
"$(DESTDIR)$(datadir)/keymaps"; \
        done
 endif
        for d in $(TARGET_DIRS); do \
diff -r c85d83074b54 -r 9be942ec0247 tools/libxen/Makefile
--- a/tools/libxen/Makefile     Wed Mar 07 10:37:05 2007 +0000
+++ b/tools/libxen/Makefile     Wed Mar 07 10:49:20 2007 +0000
@@ -57,8 +57,8 @@ test/test_hvm_bindings: test/test_hvm_bi
 
 .PHONY: install
 install: all
-       $(INSTALL_DIR) -p $(DESTDIR)/usr/include/xen/api
-       $(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)
+       $(INSTALL_DIR) $(DESTDIR)/usr/include/xen/api
+       $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
        $(INSTALL_PROG) libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
        ln -sf libxenapi.so.$(MAJOR).$(MINOR) 
$(DESTDIR)/usr/$(LIBDIR)/libxenapi.so.$(MAJOR)
        ln -sf libxenapi.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenapi.so
diff -r c85d83074b54 -r 9be942ec0247 tools/pygrub/Makefile
--- a/tools/pygrub/Makefile     Wed Mar 07 10:37:05 2007 +0000
+++ b/tools/pygrub/Makefile     Wed Mar 07 10:49:20 2007 +0000
@@ -13,11 +13,11 @@ install: LIBPATH=$(shell PYTHONPATH=../p
 install: LIBPATH=$(shell PYTHONPATH=../python/xen/util python -c "import 
auxbin; print auxbin.libpath()")
 install: all
        CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install 
--home="$(DESTDIR)/usr" --prefix="" --install-lib="$(DESTDIR)$(LIBPATH)/python"
-       $(INSTALL_DIR) -p $(DESTDIR)/var/run/xend/boot
+       $(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
 else
 install: all
        CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install 
--root="$(DESTDIR)"
-       $(INSTALL_DIR) -p $(DESTDIR)/var/run/xend/boot
+       $(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
 endif
 
 .PHONY: clean
diff -r c85d83074b54 -r 9be942ec0247 tools/security/Makefile
--- a/tools/security/Makefile   Wed Mar 07 10:37:05 2007 +0000
+++ b/tools/security/Makefile   Wed Mar 07 10:49:20 2007 +0000
@@ -58,23 +58,23 @@ install: LIBPATH=$(shell PYTHONPATH=../p
 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
diff -r c85d83074b54 -r 9be942ec0247 tools/vnet/libxutil/Makefile
--- a/tools/vnet/libxutil/Makefile      Wed Mar 07 10:37:05 2007 +0000
+++ b/tools/vnet/libxutil/Makefile      Wed Mar 07 10:49:20 2007 +0000
@@ -71,7 +71,7 @@ check-for-zlib:
 
 .PHONY: install
 install: build
-       [ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) -p 
$(DESTDIR)/usr/$(LIBDIR)
+       [ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) 
$(DESTDIR)/usr/$(LIBDIR)
        $(INSTALL_PROG) libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
        $(INSTALL_DATA) libxutil.a $(DESTDIR)/usr/$(LIBDIR)
        ln -sf libxutil.so.$(MAJOR).$(MINOR) 
$(DESTDIR)/usr/$(LIBDIR)/libxutil.so.$(MAJOR)
diff -r c85d83074b54 -r 9be942ec0247 tools/xenfb/Makefile
--- a/tools/xenfb/Makefile      Wed Mar 07 10:37:05 2007 +0000
+++ b/tools/xenfb/Makefile      Wed Mar 07 10:49:20 2007 +0000
@@ -1,12 +1,9 @@ XEN_ROOT=../..
 XEN_ROOT=../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-CFLAGS += -I$(XEN_LIBXC) -I$(XEN_XENSTORE) 
-I$(XEN_ROOT)/linux-2.6-xen-sparse/include -I$(XEN_ROOT)/tools/ioemu
+CFLAGS  += -I$(XEN_LIBXC) -I$(XEN_XENSTORE)
+CFLAGS  += -I$(XEN_ROOT)/linux-2.6-xen-sparse/include -I$(XEN_ROOT)/tools/ioemu
 LDFLAGS += -L$(XEN_LIBXC) -L$(XEN_XENSTORE)
-
-INSTALL         = install
-INSTALL_PROG    = $(INSTALL) -m0755
-INSTALL_DIR     = $(INSTALL) -d -m0755
 
 .PHONY: all
 all: build
@@ -16,7 +13,7 @@ build:
        $(MAKE) vncfb sdlfb
 
 install: all
-       $(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)/xen/bin
+       $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)/xen/bin
        $(INSTALL_PROG) vncfb $(DESTDIR)/usr/$(LIBDIR)/xen/bin/xen-vncfb
        $(INSTALL_PROG) sdlfb $(DESTDIR)/usr/$(LIBDIR)/xen/bin/xen-sdlfb
 
diff -r c85d83074b54 -r 9be942ec0247 tools/xenstore/Makefile
--- a/tools/xenstore/Makefile   Wed Mar 07 10:37:05 2007 +0000
+++ b/tools/xenstore/Makefile   Wed Mar 07 10:49:20 2007 +0000
@@ -168,16 +168,16 @@ tarball: clean
 
 .PHONY: install
 install: all
-       $(INSTALL_DIR) -p $(DESTDIR)/var/run/xenstored
-       $(INSTALL_DIR) -p $(DESTDIR)/var/lib/xenstored
-       $(INSTALL_DIR) -p $(DESTDIR)/usr/bin
-       $(INSTALL_DIR) -p $(DESTDIR)/usr/sbin
-       $(INSTALL_DIR) -p $(DESTDIR)/usr/include
+       $(INSTALL_DIR) $(DESTDIR)/var/run/xenstored
+       $(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
+       $(INSTALL_DIR) $(DESTDIR)/usr/bin
+       $(INSTALL_DIR) $(DESTDIR)/usr/sbin
+       $(INSTALL_DIR) $(DESTDIR)/usr/include
        $(INSTALL_PROG) xenstored $(DESTDIR)/usr/sbin
        $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/bin
        $(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/bin
        $(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/bin
-       $(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)
+       $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
        $(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) 
$(DESTDIR)/usr/$(LIBDIR)
        ln -sf libxenstore.so.$(MAJOR).$(MINOR) 
$(DESTDIR)/usr/$(LIBDIR)/libxenstore.so.$(MAJOR)
        ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenstore.so

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
[More with this subject...]
<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] tools: Clean up use of 'install' command., Xen patchbot-unstable <=
Previous by Date:  [Xen-changelog] [xen-unstable] ioemu: Close file descriptors when forking processes., Xen patchbot-unstable
Next by Date:  [Xen-changelog] [xen-unstable] dump-core: always use elfclass64 format to support x86_32pae., Xen patchbot-unstable
Previous by Thread:  [Xen-changelog] [xen-unstable] ioemu: Close file descriptors when forking processes., Xen patchbot-unstable
Next by Thread:  [Xen-changelog] [xen-unstable] dump-core: always use elfclass64 format to support x86_32pae., Xen patchbot-unstable
Indexes:  [Date] [Thread] [Top] [All Lists]
 
   

Copyright , Citrix Systems Inc. All rights reserved. Legal and Privacy