# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID edf0e488ea2a2074a35f189ea4637745e0f643d2
# Parent ed9c393b3c4fd9f9373a05c4415b0511e7b6ab88
Clean up duplication of 'install' macros in the Makefiles.
Signed-off-by: John Levon <john.levon@xxxxxxx>
---
docs/Makefile | 5 +++--
tools/blktap/drivers/Makefile | 6 ++----
tools/blktap/lib/Makefile | 4 ----
tools/console/Makefile | 4 ----
tools/examples/Makefile | 5 -----
tools/firmware/Makefile | 6 +++---
tools/firmware/acpi/Makefile | 2 +-
tools/ioemu/Makefile.target | 8 ++++----
tools/libxc/Makefile | 10 ++--------
tools/misc/Makefile | 4 ----
tools/misc/lomount/Makefile | 5 -----
tools/misc/mbootpack/Makefile | 4 ----
tools/misc/miniterm/Makefile | 4 ----
tools/vnet/doc/Makefile | 5 ++---
tools/vnet/examples/Makefile | 6 ++----
tools/vnet/libxutil/Makefile | 5 -----
tools/vnet/scripts/Makefile | 6 ++----
tools/vnet/vnetd/Makefile | 2 +-
tools/vtpm/Rules.mk | 5 -----
tools/vtpm_manager/Rules.mk | 5 -----
tools/xcutils/Makefile | 4 ----
tools/xenmon/Makefile | 9 ++-------
tools/xenstat/libxenstat/Makefile | 4 ----
tools/xenstat/xentop/Makefile | 4 ----
tools/xenstore/Makefile | 5 -----
tools/xentrace/Makefile | 5 -----
xen/Rules.mk | 4 ----
27 files changed, 24 insertions(+), 112 deletions(-)
diff -r ed9c393b3c4f -r edf0e488ea2a docs/Makefile
--- a/docs/Makefile Tue Oct 17 15:54:06 2006 +0100
+++ b/docs/Makefile Tue Oct 17 15:57:05 2006 +0100
@@ -1,8 +1,9 @@
#!/usr/bin/make -f
+XEN_ROOT=..
+include $(XEN_ROOT)/Config.mk
+
VERSION = xen-unstable
-INSTALL = install
-INSTALL_DIR = $(INSTALL) -d -m0755
PS2PDF := ps2pdf
DVIPS := dvips
diff -r ed9c393b3c4f -r edf0e488ea2a tools/blktap/drivers/Makefile
--- a/tools/blktap/drivers/Makefile Tue Oct 17 15:54:06 2006 +0100
+++ b/tools/blktap/drivers/Makefile Tue Oct 17 15:57:05 2006 +0100
@@ -3,11 +3,9 @@ include $(XEN_ROOT)/tools/Rules.mk
INCLUDES += -I.. -I../lib
-INSTALL = install
-INSTALL_PROG = $(INSTALL) -m0755
IBIN = blktapctrl tapdisk
QCOW_UTIL = img2qcow qcow2raw qcow-create
-INSTALL_DIR = /usr/sbin
+INST_DIR = /usr/sbin
LIBAIO_DIR = ../../libaio/src
CFLAGS += -Werror
@@ -58,7 +56,7 @@ img2qcow qcow2raw qcow-create: %: $(BLK-
$(CC) $(CFLAGS) -o $* $(BLK-OBJS) $*.c $(AIOLIBS) $(LIBS)
install: all
- $(INSTALL_PROG) $(IBIN) $(QCOW_UTIL) $(DESTDIR)$(INSTALL_DIR)
+ $(INSTALL_PROG) $(IBIN) $(QCOW_UTIL) $(DESTDIR)$(INST_DIR)
clean:
rm -rf *.o *~ $(DEPS) xen TAGS $(IBIN) $(LIB) $(QCOW_UTIL)
diff -r ed9c393b3c4f -r edf0e488ea2a tools/blktap/lib/Makefile
--- a/tools/blktap/lib/Makefile Tue Oct 17 15:54:06 2006 +0100
+++ b/tools/blktap/lib/Makefile Tue Oct 17 15:57:05 2006 +0100
@@ -6,10 +6,6 @@ SONAME = libblktap.so.$(MAJOR)
SONAME = libblktap.so.$(MAJOR)
BLKTAP_INSTALL_DIR = /usr/sbin
-
-INSTALL = install
-INSTALL_PROG = $(INSTALL) -m0755
-INSTALL_DIR = $(INSTALL) -d -m0755
INCLUDES += -I. -I.. -I $(XEN_LIBXC) -I $(XEN_XENSTORE)
diff -r ed9c393b3c4f -r edf0e488ea2a tools/console/Makefile
--- a/tools/console/Makefile Tue Oct 17 15:54:06 2006 +0100
+++ b/tools/console/Makefile Tue Oct 17 15:57:05 2006 +0100
@@ -4,10 +4,6 @@ include $(XEN_ROOT)/tools/Rules.mk
DAEMON_INSTALL_DIR = /usr/sbin
CLIENT_INSTALL_DIR = /usr/$(LIBDIR)/xen/bin
-
-INSTALL = install
-INSTALL_PROG = $(INSTALL) -m0755
-INSTALL_DIR = $(INSTALL) -d -m0755
CFLAGS += -Werror -g
diff -r ed9c393b3c4f -r edf0e488ea2a tools/examples/Makefile
--- a/tools/examples/Makefile Tue Oct 17 15:54:06 2006 +0100
+++ b/tools/examples/Makefile Tue Oct 17 15:57:05 2006 +0100
@@ -1,10 +1,5 @@ XEN_ROOT = ../../
XEN_ROOT = ../../
include $(XEN_ROOT)/tools/Rules.mk
-
-INSTALL = install
-INSTALL_DIR = $(INSTALL) -d -m0755
-INSTALL_PROG = $(INSTALL) -m0755
-INSTALL_DATA = $(INSTALL) -m0644
# Init scripts.
XEND_INITD = init.d/xend
diff -r ed9c393b3c4f -r edf0e488ea2a tools/firmware/Makefile
--- a/tools/firmware/Makefile Tue Oct 17 15:54:06 2006 +0100
+++ b/tools/firmware/Makefile Tue Oct 17 15:57:05 2006 +0100
@@ -4,7 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk
# hvmloader is a 32-bit protected mode binary.
# It belongs in /usr/lib, not /usr/lib64.
TARGET := hvmloader/hvmloader
-INSTALL_DIR := $(DESTDIR)/usr/lib/xen/boot
+INST_DIR := $(DESTDIR)/usr/lib/xen/boot
SUBDIRS :=
SUBDIRS += rombios
@@ -29,8 +29,8 @@ all:
.PHONY: install
install: all
- [ -d $(INSTALL_DIR) ] || install -d -m0755 $(INSTALL_DIR)
- [ ! -e $(TARGET) ] || install -m0644 $(TARGET) $(INSTALL_DIR)
+ [ -d $(INST_DIR) ] || $(INSTALL_DIR) $(INST_DIR)
+ [ ! -e $(TARGET) ] || $(INSTALL_DATA) $(TARGET) $(INST_DIR)
.PHONY: clean
clean:
diff -r ed9c393b3c4f -r edf0e488ea2a tools/firmware/acpi/Makefile
--- a/tools/firmware/acpi/Makefile Tue Oct 17 15:54:06 2006 +0100
+++ b/tools/firmware/acpi/Makefile Tue Oct 17 15:57:05 2006 +0100
@@ -53,7 +53,7 @@ iasl:
wget $(IASL_URL)
tar xzf $(IASL_VER).tar.gz
make -C $(IASL_VER)/compiler
- install $(IASL_VER)/compiler/iasl /usr/bin/iasl
+ $(INSTALL_PROG) $(IASL_VER)/compiler/iasl /usr/bin/iasl
$(ACPI_GEN):$(C_SRC) $(H_SRC) acpi_dsdt.c
$(HOSTCC) -o $(ACPI_GEN) $(HOSTCFLAGS) $(shell ls *.c)
diff -r ed9c393b3c4f -r edf0e488ea2a tools/ioemu/Makefile.target
--- a/tools/ioemu/Makefile.target Tue Oct 17 15:54:06 2006 +0100
+++ b/tools/ioemu/Makefile.target Tue Oct 17 15:57:05 2006 +0100
@@ -555,10 +555,10 @@ install: all
install: all
mkdir -p "$(DESTDIR)$(bindir)" "$(DESTDIR)$(configdir)"
ifneq ($(PROGS),)
- $(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"
-endif
- install -m 755 $(TARGET_PATH)/qemu-dm.debug "$(DESTDIR)$(bindir)"
- install -m 755 $(TARGET_PATH)/qemu-ifup "$(DESTDIR)$(configdir)"
+ $(INSTALL_PROG) $(PROGS) "$(DESTDIR)$(bindir)"
+endif
+ $(INSTALL_PROG) $(TARGET_PATH)/qemu-dm.debug "$(DESTDIR)$(bindir)"
+ $(INSTALL_PROG) $(TARGET_PATH)/qemu-ifup "$(DESTDIR)$(configdir)"
ifneq ($(wildcard .depend),)
include .depend
diff -r ed9c393b3c4f -r edf0e488ea2a tools/libxc/Makefile
--- a/tools/libxc/Makefile Tue Oct 17 15:54:06 2006 +0100
+++ b/tools/libxc/Makefile Tue Oct 17 15:57:05 2006 +0100
@@ -1,14 +1,8 @@
-
-INSTALL = install
-INSTALL_PROG = $(INSTALL) -m0755
-INSTALL_DATA = $(INSTALL) -m0644
-INSTALL_DIR = $(INSTALL) -d -m0755
+XEN_ROOT = ../..
+include $(XEN_ROOT)/tools/Rules.mk
MAJOR = 3.0
MINOR = 0
-
-XEN_ROOT = ../..
-include $(XEN_ROOT)/tools/Rules.mk
CTRL_SRCS-y :=
CTRL_SRCS-y += xc_core.c
diff -r ed9c393b3c4f -r edf0e488ea2a tools/misc/Makefile
--- a/tools/misc/Makefile Tue Oct 17 15:54:06 2006 +0100
+++ b/tools/misc/Makefile Tue Oct 17 15:57:05 2006 +0100
@@ -1,7 +1,3 @@ INSTALL = install
-INSTALL = install
-INSTALL_PROG = $(INSTALL) -m0755
-INSTALL_DIR = $(INSTALL) -d -m0755
-
XEN_ROOT=../..
include $(XEN_ROOT)/tools/Rules.mk
diff -r ed9c393b3c4f -r edf0e488ea2a tools/misc/lomount/Makefile
--- a/tools/misc/lomount/Makefile Tue Oct 17 15:54:06 2006 +0100
+++ b/tools/misc/lomount/Makefile Tue Oct 17 15:57:05 2006 +0100
@@ -1,8 +1,3 @@ INSTALL = install
-INSTALL = install
-INSTALL_PROG = $(INSTALL) -m0755
-INSTALL_DIR = $(INSTALL) -d -m0755
-INSTALL_DATA = $(INSTALL) -m0644
-
XEN_ROOT=../../..
include $(XEN_ROOT)/tools/Rules.mk
diff -r ed9c393b3c4f -r edf0e488ea2a tools/misc/mbootpack/Makefile
--- a/tools/misc/mbootpack/Makefile Tue Oct 17 15:54:06 2006 +0100
+++ b/tools/misc/mbootpack/Makefile Tue Oct 17 15:57:05 2006 +0100
@@ -1,10 +1,6 @@
#
# Makefile for mbootpack
#
-INSTALL = install
-INSTALL_PROG = $(INSTALL) -m0755
-INSTALL_DIR = $(INSTALL) -d -m0755
-
XEN_ROOT=../../..
include $(XEN_ROOT)/tools/Rules.mk
diff -r ed9c393b3c4f -r edf0e488ea2a tools/misc/miniterm/Makefile
--- a/tools/misc/miniterm/Makefile Tue Oct 17 15:54:06 2006 +0100
+++ b/tools/misc/miniterm/Makefile Tue Oct 17 15:57:05 2006 +0100
@@ -1,9 +1,5 @@ XEN_ROOT:=../../..
XEN_ROOT:=../../..
include $(XEN_ROOT)/tools/Rules.mk
-
-INSTALL = install
-INSTALL_PROG = $(INSTALL) -m0755
-INSTALL_DIR = $(INSTALL) -d -m0755
TARGET = miniterm
diff -r ed9c393b3c4f -r edf0e488ea2a tools/vnet/doc/Makefile
--- a/tools/vnet/doc/Makefile Tue Oct 17 15:54:06 2006 +0100
+++ b/tools/vnet/doc/Makefile Tue Oct 17 15:57:05 2006 +0100
@@ -1,11 +1,10 @@
#!/usr/bin/make -f
# -*- mode: Makefile; -*-
+XEN_ROOT = ../../..
+include $(XEN_ROOT)/tools/Rules.mk
VERSION = 1.0
HEADER = Vnet
-
-INSTALL = install
-INSTALL_DIR = $(INSTALL) -d -m0755
PS2PDF := ps2pdf
DVIPS := dvips
diff -r ed9c393b3c4f -r edf0e488ea2a tools/vnet/examples/Makefile
--- a/tools/vnet/examples/Makefile Tue Oct 17 15:54:06 2006 +0100
+++ b/tools/vnet/examples/Makefile Tue Oct 17 15:57:05 2006 +0100
@@ -1,9 +1,7 @@
# -*- mode: Makefile; -*-
#============================================================================
-
-INSTALL = install
-INSTALL_PROG = $(INSTALL) -m0755
-INSTALL_DIR = $(INSTALL) -d -m0755
+XEN_ROOT = ../../..
+include $(XEN_ROOT)/tools/Rules.mk
XEN_SCRIPT_DIR = $(DESTDIR)/etc/xen/scripts
diff -r ed9c393b3c4f -r edf0e488ea2a tools/vnet/libxutil/Makefile
--- a/tools/vnet/libxutil/Makefile Tue Oct 17 15:54:06 2006 +0100
+++ b/tools/vnet/libxutil/Makefile Tue Oct 17 15:57:05 2006 +0100
@@ -2,11 +2,6 @@ export VNET_ROOT = $(shell cd .. && pwd)
export VNET_ROOT = $(shell cd .. && pwd)
include $(VNET_ROOT)/Make.env
endif
-
-INSTALL = install
-INSTALL_DATA = $(INSTALL) -m0644
-INSTALL_PROG = $(INSTALL) -m0755
-INSTALL_DIR = $(INSTALL) -d -m0755
include $(XEN_ROOT)/tools/Rules.mk
diff -r ed9c393b3c4f -r edf0e488ea2a tools/vnet/scripts/Makefile
--- a/tools/vnet/scripts/Makefile Tue Oct 17 15:54:06 2006 +0100
+++ b/tools/vnet/scripts/Makefile Tue Oct 17 15:57:05 2006 +0100
@@ -1,9 +1,7 @@
# -*- mode: Makefile; -*-
#============================================================================
-
-INSTALL = install
-INSTALL_PROG = $(INSTALL) -m0755
-INSTALL_DIR = $(INSTALL) -d -m0755
+XEN_ROOT = ../../..
+include $(XEN_ROOT)/tools/Rules.mk
SBIN_DIR = $(DESTDIR)/usr/sbin
diff -r ed9c393b3c4f -r edf0e488ea2a tools/vnet/vnetd/Makefile
--- a/tools/vnet/vnetd/Makefile Tue Oct 17 15:54:06 2006 +0100
+++ b/tools/vnet/vnetd/Makefile Tue Oct 17 15:57:05 2006 +0100
@@ -110,7 +110,7 @@ vnetd: $(VNETD_OBJ)
.PHONY: install
install: vnetd
mkdir -p $(DESTDIR)$(VNETD_INSTALL_DIR)
- install -m 0755 vnetd $(DESTDIR)$(VNETD_INSTALL_DIR)
+ $(INSTALL_PROG) vnetd $(DESTDIR)$(VNETD_INSTALL_DIR)
.PHONY: clean
clean:
diff -r ed9c393b3c4f -r edf0e488ea2a tools/vtpm/Rules.mk
--- a/tools/vtpm/Rules.mk Tue Oct 17 15:54:06 2006 +0100
+++ b/tools/vtpm/Rules.mk Tue Oct 17 15:57:05 2006 +0100
@@ -4,11 +4,6 @@ include $(XEN_ROOT)/tools/Rules.mk
#
# Tool definitions
#
-
-# Installation program and options
-INSTALL = install
-INSTALL_PROG = $(INSTALL) -m0755
-INSTALL_DIR = $(INSTALL) -d -m0755
# Xen tools installation directory
TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin
diff -r ed9c393b3c4f -r edf0e488ea2a tools/vtpm_manager/Rules.mk
--- a/tools/vtpm_manager/Rules.mk Tue Oct 17 15:54:06 2006 +0100
+++ b/tools/vtpm_manager/Rules.mk Tue Oct 17 15:57:05 2006 +0100
@@ -4,11 +4,6 @@ include $(XEN_ROOT)/tools/Rules.mk
#
# Tool definitions
#
-
-# Installation program and options
-INSTALL = install
-INSTALL_PROG = $(INSTALL) -m0755
-INSTALL_DIR = $(INSTALL) -d -m0755
# Xen tools installation directory
TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin
diff -r ed9c393b3c4f -r edf0e488ea2a tools/xcutils/Makefile
--- a/tools/xcutils/Makefile Tue Oct 17 15:54:06 2006 +0100
+++ b/tools/xcutils/Makefile Tue Oct 17 15:57:05 2006 +0100
@@ -7,10 +7,6 @@
#
# Copyright (C) 2005 by Christian Limpach
#
-
-INSTALL = install
-INSTALL_PROG = $(INSTALL) -m0755
-INSTALL_DIR = $(INSTALL) -d -m0755
XEN_ROOT = ../..
include $(XEN_ROOT)/tools/Rules.mk
diff -r ed9c393b3c4f -r edf0e488ea2a tools/xenmon/Makefile
--- a/tools/xenmon/Makefile Tue Oct 17 15:54:06 2006 +0100
+++ b/tools/xenmon/Makefile Tue Oct 17 15:57:05 2006 +0100
@@ -10,15 +10,10 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-INSTALL = install
-INSTALL_PROG = $(INSTALL) -m0755
-INSTALL_DIR = $(INSTALL) -d -m0755
-INSTALL_DATA = $(INSTALL) -m0644
+XEN_ROOT=../..
+include $(XEN_ROOT)/tools/Rules.mk
sbindir=/usr/sbin
-
-XEN_ROOT=../..
-include $(XEN_ROOT)/tools/Rules.mk
CFLAGS += -Werror -g
CFLAGS += -I $(XEN_XC)
diff -r ed9c393b3c4f -r edf0e488ea2a tools/xenstat/libxenstat/Makefile
--- a/tools/xenstat/libxenstat/Makefile Tue Oct 17 15:54:06 2006 +0100
+++ b/tools/xenstat/libxenstat/Makefile Tue Oct 17 15:57:05 2006 +0100
@@ -15,10 +15,6 @@ XEN_ROOT=../../..
XEN_ROOT=../../..
include $(XEN_ROOT)/tools/Rules.mk
LINUX_ROOT := $(XEN_ROOT)/linux-2.6-xen-sparse
-
-INSTALL = install
-INSTALL_PROG = $(INSTALL) -m0755 -D
-INSTALL_DATA = $(INSTALL) -m0644 -D
prefix=/usr
includedir=$(prefix)/include
diff -r ed9c393b3c4f -r edf0e488ea2a tools/xenstat/xentop/Makefile
--- a/tools/xenstat/xentop/Makefile Tue Oct 17 15:54:06 2006 +0100
+++ b/tools/xenstat/xentop/Makefile Tue Oct 17 15:57:05 2006 +0100
@@ -17,10 +17,6 @@ ifneq ($(XENSTAT_XENTOP),y)
.PHONY: all install xentop
all install xentop:
else
-
-INSTALL = install
-INSTALL_PROG = $(INSTALL) -m0755 -D
-INSTALL_DATA = $(INSTALL) -m0644 -D
prefix=/usr
mandir=$(prefix)/share/man
diff -r ed9c393b3c4f -r edf0e488ea2a tools/xenstore/Makefile
--- a/tools/xenstore/Makefile Tue Oct 17 15:54:06 2006 +0100
+++ b/tools/xenstore/Makefile Tue Oct 17 15:57:05 2006 +0100
@@ -4,11 +4,6 @@ XEN_LIBXC = $(XEN_ROOT)/tools/l
MAJOR = 3.0
MINOR = 0
-
-INSTALL = install
-INSTALL_DATA = $(INSTALL) -m0644
-INSTALL_PROG = $(INSTALL) -m0755
-INSTALL_DIR = $(INSTALL) -d -m0755
PROFILE=#-pg
BASECFLAGS=-Wall -g -Werror
diff -r ed9c393b3c4f -r edf0e488ea2a tools/xentrace/Makefile
--- a/tools/xentrace/Makefile Tue Oct 17 15:54:06 2006 +0100
+++ b/tools/xentrace/Makefile Tue Oct 17 15:57:05 2006 +0100
@@ -1,8 +1,3 @@ INSTALL = install
-INSTALL = install
-INSTALL_PROG = $(INSTALL) -m0755
-INSTALL_DIR = $(INSTALL) -d -m0755
-INSTALL_DATA = $(INSTALL) -m0644
-
XEN_ROOT=../..
include $(XEN_ROOT)/tools/Rules.mk
diff -r ed9c393b3c4f -r edf0e488ea2a xen/Rules.mk
--- a/xen/Rules.mk Tue Oct 17 15:54:06 2006 +0100
+++ b/xen/Rules.mk Tue Oct 17 15:57:05 2006 +0100
@@ -34,10 +34,6 @@ HDRS += $(wildcard $(BASEDIR)/include/pu
HDRS += $(wildcard $(BASEDIR)/include/public/*.h)
HDRS += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/*.h)
HDRS += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/$(TARGET_SUBARCH)/*.h)
-
-INSTALL := install
-INSTALL_DATA := $(INSTALL) -m0644
-INSTALL_DIR := $(INSTALL) -d -m0755
include $(BASEDIR)/arch/$(TARGET_ARCH)/Rules.mk
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|