Xen project Mailing List

[Xen-changelog] [xen master] tools: replace private SBINDIR with automake sbindir

Date: Thu, 28 May 2015 18:49:56 +0000

Delivery-date: Thu, 28 May 2015 18:50:00 +0000

List-id: "Change log for Mercurial $receive only$" <xen-changelog.lists.xen.org>

commit 8e986e5a61efeca92b9b268e77957d45d8316ee4 Author: Olaf Hering <olaf@xxxxxxxxx> AuthorDate: Mon May 11 15:24:49 2015 +0000 Commit: Ian Campbell <ian.campbell@xxxxxxxxxx> CommitDate: Thu May 21 15:12:10 2015 +0100 tools: replace private SBINDIR with automake sbindir Reuse automake variable instead of inventing a private variable. The result of this command: git grep -wnl SBINDIR | xargs sed -i 's@SBINDIR@sbindir@g' Signed-off-by: Olaf Hering <olaf@xxxxxxxxx> Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx> Cc: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx> Cc: Ian Campbell <ian.campbell@xxxxxxxxxx> Cc: Wei Liu <wei.liu2@xxxxxxxxxx> Cc: Mukesh Rathor <mukesh.rathor@xxxxxxxxxx> Cc: Tim Deegan <tim@xxxxxxx> Cc: Daniel De Graaf <dgdegra@xxxxxxxxxxxxx> Cc: David Scott <dave.scott@xxxxxxxxxxxxx> Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx> --- Config.mk | 2 +- config/Paths.mk.in | 1 - tools/Makefile | 6 +++--- tools/blktap2/control/Makefile | 4 ++-- tools/blktap2/drivers/Makefile | 2 +- tools/blktap2/vhd/Makefile | 2 +- tools/console/Makefile | 4 ++-- tools/debugger/gdbsx/Makefile | 4 ++-- tools/debugger/kdd/Makefile | 4 ++-- tools/flask/utils/Makefile | 4 ++-- tools/hotplug/FreeBSD/rc.d/xencommons.in | 12 ++++++------ tools/hotplug/FreeBSD/vif-bridge | 2 +- tools/hotplug/Linux/init.d/xen-watchdog.in | 2 +- tools/hotplug/Linux/init.d/xencommons.in | 2 +- tools/hotplug/Linux/xen-hotplug-common.sh.in | 2 +- tools/hotplug/Linux/xendomains.in | 2 +- tools/hotplug/NetBSD/block | 2 +- tools/hotplug/NetBSD/rc.d/xen-watchdog | 4 ++-- tools/hotplug/NetBSD/rc.d/xencommons.in | 12 ++++++------ tools/hotplug/NetBSD/rc.d/xendomains | 2 +- tools/hotplug/NetBSD/vif-bridge | 2 +- tools/hotplug/NetBSD/vif-ip | 2 +- tools/libxl/Makefile | 4 ++-- tools/misc/Makefile | 4 ++-- tools/ocaml/xenstored/Makefile | 4 ++-- tools/tests/mce-test/tools/Makefile | 2 +- tools/xenbackendd/Makefile | 4 ++-- tools/xenmon/Makefile | 8 ++++---- tools/xenpmd/Makefile | 4 ++-- tools/xenstat/xentop/Makefile | 4 ++-- tools/xenstore/Makefile | 4 ++-- 31 files changed, 58 insertions(+), 59 deletions(-) diff --git a/Config.mk b/Config.mk index 28b77d6..abb1e44 100644 --- a/Config.mk +++ b/Config.mk @@ -157,7 +157,7 @@ define move-if-changed if ! cmp -s $(1) $(2); then mv -f $(1) $(2); else rm -f $(1); fi endef -BUILD_MAKE_VARS := SBINDIR BINDIR LIBEXEC LIBEXEC_BIN LIBDIR SHAREDIR \ +BUILD_MAKE_VARS := sbindir BINDIR LIBEXEC LIBEXEC_BIN LIBDIR SHAREDIR \ XENFIRMWAREDIR XEN_CONFIG_DIR XEN_SCRIPT_DIR XEN_LOCK_DIR \ XEN_RUN_DIR XEN_PAGING_DIR diff --git a/config/Paths.mk.in b/config/Paths.mk.in index 150bae7..26674b1 100644 --- a/config/Paths.mk.in +++ b/config/Paths.mk.in @@ -31,7 +31,6 @@ sysconfdir := @sysconfdir@ PREFIX := $(prefix) -SBINDIR := $(sbindir) BINDIR := $(bindir) LIBEXEC := $(libexecdir)/$(PACKAGE_TARNAME) LIBEXEC_BIN := @LIBEXEC_BIN@ diff --git a/tools/Makefile b/tools/Makefile index 966354a..77625cb 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -71,7 +71,7 @@ uninstall: rm -f $(D)$(CONFIG_DIR)/udev/rules.d/xen-backend.rules rm -f $(D)$(CONFIG_DIR)/udev/rules.d/xend.rules rm -f $(D)$(SYSCONFIG_DIR)/xendomains - rm -f $(D)$(SBINDIR)/xendomains + rm -f $(D)$(sbindir)/xendomains rm -f $(D)$(SYSCONFIG_DIR)/xencommons rm -rf $(D)/var/lib/xen* rm -rf $(D)$(BINDIR)/cpuperf-perfcntr $(D)$(BINDIR)/cpuperf-xen @@ -93,8 +93,8 @@ uninstall: rm -rf $(D)$(LIBDIR)/libxenstore* $(D)$(LIBDIR)/libxlutil* rm -rf $(D)$(LIBDIR)/python/xen $(D)$(LIBDIR)/python/grub rm -rf $(D)$(LIBEXEC) - rm -rf $(D)$(SBINDIR)/setmask - rm -rf $(D)$(SBINDIR)/xen* $(D)$(SBINDIR)/netfix $(D)$(SBINDIR)/xm + rm -rf $(D)$(sbindir)/setmask + rm -rf $(D)$(sbindir)/xen* $(D)$(sbindir)/netfix $(D)$(sbindir)/xm rm -rf $(D)$(SHAREDIR)/doc/xen rm -rf $(D)$(SHAREDIR)/xen rm -rf $(D)$(SHAREDIR)/qemu-xen diff --git a/tools/blktap2/control/Makefile b/tools/blktap2/control/Makefile index 1ae6902..9ae2e51 100644 --- a/tools/blktap2/control/Makefile +++ b/tools/blktap2/control/Makefile @@ -61,8 +61,8 @@ $(LIB_SHARED): $(CTL_PICS) $(CC) $(LDFLAGS) -fPIC -Wl,$(SONAME_LDFLAG) -Wl,$(LIBSONAME) $(SHLIB_LDFLAGS) -rdynamic $^ -o $@ $(APPEND_LDFLAGS) install: $(IBIN) $(LIB_STATIC) $(LIB_SHARED) - $(INSTALL_DIR) -p $(DESTDIR)$(SBINDIR) - $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(SBINDIR) + $(INSTALL_DIR) -p $(DESTDIR)$(sbindir) + $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(sbindir) $(INSTALL_DATA) $(LIB_STATIC) $(DESTDIR)$(LIBDIR) $(INSTALL_PROG) $(LIB_SHARED) $(DESTDIR)$(LIBDIR) ln -sf $(LIBSONAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME).so diff --git a/tools/blktap2/drivers/Makefile b/tools/blktap2/drivers/Makefile index 2f96c91..5328c40 100644 --- a/tools/blktap2/drivers/Makefile +++ b/tools/blktap2/drivers/Makefile @@ -7,7 +7,7 @@ LIBVHDDIR = $(BLKTAP_ROOT)/vhd/lib IBIN = tapdisk2 td-util tapdisk-client tapdisk-stream tapdisk-diff QCOW_UTIL = img2qcow qcow-create qcow2raw LOCK_UTIL = lock-util -INST_DIR = $(SBINDIR) +INST_DIR = $(sbindir) CFLAGS += -Werror CFLAGS += -Wno-unused diff --git a/tools/blktap2/vhd/Makefile b/tools/blktap2/vhd/Makefile index 9e21cce..fabd665 100644 --- a/tools/blktap2/vhd/Makefile +++ b/tools/blktap2/vhd/Makefile @@ -6,7 +6,7 @@ SUBDIRS-y := SUBDIRS-y += lib IBIN = vhd-util vhd-update -INST_DIR = $(SBINDIR) +INST_DIR = $(sbindir) CFLAGS += -Werror CFLAGS += -Wno-unused diff --git a/tools/console/Makefile b/tools/console/Makefile index 239ec60..71f8088 100644 --- a/tools/console/Makefile +++ b/tools/console/Makefile @@ -33,8 +33,8 @@ xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c)) .PHONY: install install: $(BIN) - $(INSTALL_DIR) $(DESTDIR)/$(SBINDIR) - $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(SBINDIR) + $(INSTALL_DIR) $(DESTDIR)/$(sbindir) + $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(sbindir) $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_PROG) xenconsole $(DESTDIR)$(LIBEXEC_BIN) diff --git a/tools/debugger/gdbsx/Makefile b/tools/debugger/gdbsx/Makefile index 31eb900..4ed6d76 100644 --- a/tools/debugger/gdbsx/Makefile +++ b/tools/debugger/gdbsx/Makefile @@ -18,8 +18,8 @@ distclean: clean .PHONY: install install: all - [ -d $(DESTDIR)$(SBINDIR) ] || $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) - $(INSTALL_PROG) gdbsx $(DESTDIR)$(SBINDIR)/gdbsx + [ -d $(DESTDIR)$(sbindir) ] || $(INSTALL_DIR) $(DESTDIR)$(sbindir) + $(INSTALL_PROG) gdbsx $(DESTDIR)$(sbindir)/gdbsx gdbsx: gx/gx_all.a xg/xg_all.a $(CC) -o $@ $^ diff --git a/tools/debugger/kdd/Makefile b/tools/debugger/kdd/Makefile index 8eafc82..a79d7cf 100644 --- a/tools/debugger/kdd/Makefile +++ b/tools/debugger/kdd/Makefile @@ -21,5 +21,5 @@ distclean: clean .PHONY: install install: all - [ -d $(DESTDIR)$(SBINDIR) ] || $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) - $(INSTALL_PROG) kdd $(DESTDIR)$(SBINDIR)/kdd + [ -d $(DESTDIR)$(sbindir) ] || $(INSTALL_DIR) $(DESTDIR)$(sbindir) + $(INSTALL_PROG) kdd $(DESTDIR)$(sbindir)/kdd diff --git a/tools/flask/utils/Makefile b/tools/flask/utils/Makefile index 5dfd271..91a53b4 100644 --- a/tools/flask/utils/Makefile +++ b/tools/flask/utils/Makefile @@ -52,7 +52,7 @@ print-end: .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) - $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)$(SBINDIR) + $(INSTALL_DIR) $(DESTDIR)$(sbindir) + $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)$(sbindir) -include $(DEPS) diff --git a/tools/hotplug/FreeBSD/rc.d/xencommons.in b/tools/hotplug/FreeBSD/rc.d/xencommons.in index 900990b..3e204d6 100644 --- a/tools/hotplug/FreeBSD/rc.d/xencommons.in +++ b/tools/hotplug/FreeBSD/rc.d/xencommons.in @@ -33,7 +33,7 @@ xen_startcmd() local time=0 local timeout=30 - xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${SBINDIR}/xenstored) + xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${sbindir}/xenstored) if test -z "$xenstored_pid"; then printf "Cleaning xenstore database.\n" if [ -z "${XENSTORED_ROOTDIR}" ]; then @@ -45,7 +45,7 @@ xen_startcmd() if [ -n "${XENSTORED_TRACE}" ]; then XENSTORED_ARGS="${XENSTORED_ARGS} -T /var/log/xen/xenstored-trace.log" fi - ${SBINDIR}/xenstored ${XENSTORED_ARGS} + ${sbindir}/xenstored ${XENSTORED_ARGS} while [ $time -lt $timeout ] && ! `${BINDIR}/xenstore-read -s / >/dev/null 2>&1` ; do printf "." time=$(($time+1)) @@ -60,7 +60,7 @@ xen_startcmd() XENCONSOLED_ARGS="${XENCONSOLED_ARGS} --log=${XENCONSOLED_TRACE}" fi - ${SBINDIR}/xenconsoled ${XENCONSOLED_ARGS} + ${sbindir}/xenconsoled ${XENCONSOLED_ARGS} printf "\n" @@ -74,7 +74,7 @@ xen_stop() printf "Stopping xencommons.\n" printf "WARNING: Not stopping xenstored, as it cannot be restarted.\n" - rc_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${SBINDIR}/xenconsoled) + rc_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${sbindir}/xenconsoled) pids="$pids $rc_pid" kill -${sig_stop:-TERM} $pids @@ -83,12 +83,12 @@ xen_stop() xen_status() { - xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${SBINDIR}/xenstored) + xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${sbindir}/xenstored) if test -n ${xenstored_pid}; then pids="$pids $xenstored_pid" fi - xenconsoled_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${SBINDIR}/xenconsoled) + xenconsoled_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${sbindir}/xenconsoled) if test -n ${xenconsoled_pid}; then pids="$pids $xenconsoled_pid" fi diff --git a/tools/hotplug/FreeBSD/vif-bridge b/tools/hotplug/FreeBSD/vif-bridge index 062b20a..3319710 100644 --- a/tools/hotplug/FreeBSD/vif-bridge +++ b/tools/hotplug/FreeBSD/vif-bridge @@ -13,7 +13,7 @@ DIR=$(dirname "$0") . "${DIR}/hotplugpath.sh" -PATH=${BINDIR}:${SBINDIR}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin +PATH=${BINDIR}:${sbindir}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin export PATH path=$1 diff --git a/tools/hotplug/Linux/init.d/xen-watchdog.in b/tools/hotplug/Linux/init.d/xen-watchdog.in index 32c7268..c05f1f6 100644 --- a/tools/hotplug/Linux/init.d/xen-watchdog.in +++ b/tools/hotplug/Linux/init.d/xen-watchdog.in @@ -19,7 +19,7 @@ . @XEN_SCRIPT_DIR@/hotplugpath.sh -DAEMON=${SBINDIR}/xenwatchdogd +DAEMON=${sbindir}/xenwatchdogd base=$(basename $DAEMON) # Source function library. diff --git a/tools/hotplug/Linux/init.d/xencommons.in b/tools/hotplug/Linux/init.d/xencommons.in index a1095c2..82b3fcb 100644 --- a/tools/hotplug/Linux/init.d/xencommons.in +++ b/tools/hotplug/Linux/init.d/xencommons.in @@ -96,7 +96,7 @@ do_start () { echo Starting xenconsoled... test -z "$XENCONSOLED_TRACE" || XENCONSOLED_ARGS=" --log=$XENCONSOLED_TRACE" - ${SBINDIR}/xenconsoled --pid-file=$XENCONSOLED_PIDFILE $XENCONSOLED_ARGS + ${sbindir}/xenconsoled --pid-file=$XENCONSOLED_PIDFILE $XENCONSOLED_ARGS echo Starting QEMU as disk backend for dom0 test -z "$QEMU_XEN" && QEMU_XEN="${LIBEXEC_BIN}/qemu-system-i386" $QEMU_XEN -xen-domid 0 -xen-attach -name dom0 -nographic -M xenpv -daemonize \ diff --git a/tools/hotplug/Linux/xen-hotplug-common.sh.in b/tools/hotplug/Linux/xen-hotplug-common.sh.in index 1deafe1..f698880 100644 --- a/tools/hotplug/Linux/xen-hotplug-common.sh.in +++ b/tools/hotplug/Linux/xen-hotplug-common.sh.in @@ -30,7 +30,7 @@ dir=$(dirname "$0") exec 2>>/var/log/xen/xen-hotplug.log -export PATH="${BINDIR}:${SBINDIR}:${LIBEXEC_BIN}:/sbin:/bin:/usr/bin:/usr/sbin:$PATH" +export PATH="${BINDIR}:${sbindir}:${LIBEXEC_BIN}:/sbin:/bin:/usr/bin:/usr/sbin:$PATH" export LD_LIBRARY_PATH="${LIBDIR}${LD_LIBRARY_PATH+:}$LD_LIBRARY_PATH" export LANG="POSIX" unset $(set | grep ^LC_ | cut -d= -f1) diff --git a/tools/hotplug/Linux/xendomains.in b/tools/hotplug/Linux/xendomains.in index 2e65ac6..0603842 100644 --- a/tools/hotplug/Linux/xendomains.in +++ b/tools/hotplug/Linux/xendomains.in @@ -29,7 +29,7 @@ . @XEN_SCRIPT_DIR@/hotplugpath.sh -CMD=${SBINDIR}/xl +CMD=${sbindir}/xl HEADCOMP="Xen saved domain" $CMD list &> /dev/null if test $? -ne 0 diff --git a/tools/hotplug/NetBSD/block b/tools/hotplug/NetBSD/block index b2e9af5..3a78ea2 100644 --- a/tools/hotplug/NetBSD/block +++ b/tools/hotplug/NetBSD/block @@ -7,7 +7,7 @@ DIR=$(dirname "$0") . "${DIR}/hotplugpath.sh" -PATH=${BINDIR}:${SBINDIR}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin +PATH=${BINDIR}:${sbindir}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin export PATH error() { diff --git a/tools/hotplug/NetBSD/rc.d/xen-watchdog b/tools/hotplug/NetBSD/rc.d/xen-watchdog index ff4a52c..0941fe7 100644 --- a/tools/hotplug/NetBSD/rc.d/xen-watchdog +++ b/tools/hotplug/NetBSD/rc.d/xen-watchdog @@ -16,8 +16,8 @@ export LD_LIBRARY_PATH name="xenwatchdog" rcvar=$name -command="${SBINDIR}/xenwatchdogd" -start_cmd="echo Starting ${name}. && PATH=${PATH}:${SBINDIR} ${command} 30 15" +command="${sbindir}/xenwatchdogd" +start_cmd="echo Starting ${name}. && PATH=${PATH}:${sbindir} ${command} 30 15" load_rc_config $name run_rc_command "$1" diff --git a/tools/hotplug/NetBSD/rc.d/xencommons.in b/tools/hotplug/NetBSD/rc.d/xencommons.in index db03f22..82c2171 100644 --- a/tools/hotplug/NetBSD/rc.d/xencommons.in +++ b/tools/hotplug/NetBSD/rc.d/xencommons.in @@ -37,7 +37,7 @@ xen_startcmd() local time=0 local timeout=30 - xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${SBINDIR}/xenstored) + xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${sbindir}/xenstored) if test -z "$xenstored_pid"; then printf "Cleaning xenstore database.\n" if [ -z "${XENSTORED_ROOTDIR}" ]; then @@ -49,7 +49,7 @@ xen_startcmd() if [ -n "${XENSTORED_TRACE}" ]; then XENSTORED_ARGS="${XENSTORED_ARGS} -T /var/log/xen/xenstored-trace.log" fi - ${SBINDIR}/xenstored ${XENSTORED_ARGS} + ${sbindir}/xenstored ${XENSTORED_ARGS} while [ $time -lt $timeout ] && ! `${BINDIR}/xenstore-read -s / >/dev/null 2>&1` ; do printf "." time=$(($time+1)) @@ -64,7 +64,7 @@ xen_startcmd() XENCONSOLED_ARGS="${XENCONSOLED_ARGS} --log=${XENCONSOLED_TRACE}" fi - ${SBINDIR}/xenconsoled ${XENCONSOLED_ARGS} + ${sbindir}/xenconsoled ${XENCONSOLED_ARGS} printf "\n" @@ -78,7 +78,7 @@ xen_stop() printf "Stopping xencommons.\n" printf "WARNING: Not stopping xenstored, as it cannot be restarted.\n" - rc_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${SBINDIR}/xenconsoled) + rc_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${sbindir}/xenconsoled) pids="$pids $rc_pid" kill -${sig_stop:-TERM} $pids @@ -87,12 +87,12 @@ xen_stop() xen_status() { - xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${SBINDIR}/xenstored) + xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${sbindir}/xenstored) if test -n ${xenstored_pid}; then pids="$pids $xenstored_pid" fi - xenconsoled_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${SBINDIR}/xenconsoled) + xenconsoled_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${sbindir}/xenconsoled) if test -n ${xenconsoled_pid}; then pids="$pids $xenconsoled_pid" fi diff --git a/tools/hotplug/NetBSD/rc.d/xendomains b/tools/hotplug/NetBSD/rc.d/xendomains index b0e7111..204a8f0 100644 --- a/tools/hotplug/NetBSD/rc.d/xendomains +++ b/tools/hotplug/NetBSD/rc.d/xendomains @@ -34,7 +34,7 @@ LD_LIBRARY_PATH="${LIBDIR}" export LD_LIBRARY_PATH name="xendomains" -ctl_command="${SBINDIR}/xl" +ctl_command="${sbindir}/xl" start_cmd="xendomains_start" stop_cmd="xendomains_stop" list_cmd="xendomains_list" diff --git a/tools/hotplug/NetBSD/vif-bridge b/tools/hotplug/NetBSD/vif-bridge index 960303e..d6a2b16 100644 --- a/tools/hotplug/NetBSD/vif-bridge +++ b/tools/hotplug/NetBSD/vif-bridge @@ -7,7 +7,7 @@ DIR=$(dirname "$0") . "${DIR}/hotplugpath.sh" -PATH=${BINDIR}:${SBINDIR}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin +PATH=${BINDIR}:${sbindir}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin export PATH xpath=$1 diff --git a/tools/hotplug/NetBSD/vif-ip b/tools/hotplug/NetBSD/vif-ip index 28c43de..fd60b7e 100644 --- a/tools/hotplug/NetBSD/vif-ip +++ b/tools/hotplug/NetBSD/vif-ip @@ -7,7 +7,7 @@ DIR=$(dirname "$0") . "${DIR}/hotplugpath.sh" -PATH=${BINDIR}:${SBINDIR}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin +PATH=${BINDIR}:${sbindir}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin export PATH xpath=$1 diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 2afb146..8e5181e 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -256,13 +256,13 @@ $(PKG_CONFIG): % : %.in Makefile .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) + $(INSTALL_DIR) $(DESTDIR)$(sbindir) $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR) $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/pkgconfig - $(INSTALL_PROG) xl $(DESTDIR)$(SBINDIR) + $(INSTALL_PROG) xl $(DESTDIR)$(sbindir) $(INSTALL_PROG) xen-init-dom0 $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) diff --git a/tools/misc/Makefile b/tools/misc/Makefile index ccd36af..a3007c2 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -52,10 +52,10 @@ all build: $(TARGETS_BUILD) .PHONY: install install: build $(INSTALL_DIR) $(DESTDIR)$(BINDIR) - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) + $(INSTALL_DIR) $(DESTDIR)$(sbindir) $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_PYTHON_PROG) $(INSTALL_BIN) $(DESTDIR)$(BINDIR) - $(INSTALL_PYTHON_PROG) $(INSTALL_SBIN) $(DESTDIR)$(SBINDIR) + $(INSTALL_PYTHON_PROG) $(INSTALL_SBIN) $(DESTDIR)$(sbindir) $(INSTALL_PYTHON_PROG) $(INSTALL_PRIVBIN) $(DESTDIR)$(LIBEXEC_BIN) .PHONY: clean diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile index 48f1079..bcf09d4 100644 --- a/tools/ocaml/xenstored/Makefile +++ b/tools/ocaml/xenstored/Makefile @@ -77,8 +77,8 @@ bins: $(PROGRAMS) libs: $(LIBS) install: all - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) - $(INSTALL_PROG) oxenstored $(DESTDIR)$(SBINDIR) + $(INSTALL_DIR) $(DESTDIR)$(sbindir) + $(INSTALL_PROG) oxenstored $(DESTDIR)$(sbindir) $(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR) $(INSTALL_DATA) oxenstored.conf $(DESTDIR)$(XEN_CONFIG_DIR) diff --git a/tools/tests/mce-test/tools/Makefile b/tools/tests/mce-test/tools/Makefile index 4a0db49..924e4dd 100644 --- a/tools/tests/mce-test/tools/Makefile +++ b/tools/tests/mce-test/tools/Makefile @@ -13,7 +13,7 @@ CFLAGS += $(CFLAGS_xeninclude) all: xen-mceinj install: xen-mceinj - $(INSTALL_PROG) xen-mceinj $(DESTDIR)$(SBINDIR) + $(INSTALL_PROG) xen-mceinj $(DESTDIR)$(sbindir) .PHONY: clean clean: diff --git a/tools/xenbackendd/Makefile b/tools/xenbackendd/Makefile index b6bc160..f52be74 100644 --- a/tools/xenbackendd/Makefile +++ b/tools/xenbackendd/Makefile @@ -25,8 +25,8 @@ build: xenbackendd .PHONY: install install: build - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) - $(INSTALL_PROG) xenbackendd $(DESTDIR)$(SBINDIR) + $(INSTALL_DIR) $(DESTDIR)$(sbindir) + $(INSTALL_PROG) xenbackendd $(DESTDIR)$(sbindir) .PHONY: clean clean: diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile index c206d94..a676d32 100644 --- a/tools/xenmon/Makefile +++ b/tools/xenmon/Makefile @@ -27,10 +27,10 @@ build: xentrace_setmask xenbaked .PHONY: install install: build - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) - $(INSTALL_PROG) xenbaked $(DESTDIR)$(SBINDIR)/xenbaked - $(INSTALL_PROG) xentrace_setmask $(DESTDIR)$(SBINDIR)/xentrace_setmask - $(INSTALL_PROG) xenmon.py $(DESTDIR)$(SBINDIR)/xenmon.py + $(INSTALL_DIR) $(DESTDIR)$(sbindir) + $(INSTALL_PROG) xenbaked $(DESTDIR)$(sbindir)/xenbaked + $(INSTALL_PROG) xentrace_setmask $(DESTDIR)$(sbindir)/xentrace_setmask + $(INSTALL_PROG) xenmon.py $(DESTDIR)$(sbindir)/xenmon.py $(INSTALL_DIR) $(DESTDIR)$(DOCDIR) $(INSTALL_DATA) README $(DESTDIR)$(DOCDIR)/README.xenmon diff --git a/tools/xenpmd/Makefile b/tools/xenpmd/Makefile index 4605261..55e8fc5 100644 --- a/tools/xenpmd/Makefile +++ b/tools/xenpmd/Makefile @@ -11,8 +11,8 @@ all: xenpmd .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) - $(INSTALL_PROG) xenpmd $(DESTDIR)$(SBINDIR) + $(INSTALL_DIR) $(DESTDIR)$(sbindir) + $(INSTALL_PROG) xenpmd $(DESTDIR)$(sbindir) .PHONY: clean clean: diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile index 5376fdc..2652c9d 100644 --- a/tools/xenstat/xentop/Makefile +++ b/tools/xenstat/xentop/Makefile @@ -31,8 +31,8 @@ all: xentop .PHONY: install install: xentop xentop.1 - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) - $(INSTALL_PROG) xentop $(DESTDIR)$(SBINDIR)/xentop + $(INSTALL_DIR) $(DESTDIR)$(sbindir) + $(INSTALL_PROG) xentop $(DESTDIR)$(sbindir)/xentop $(INSTALL_DIR) $(DESTDIR)$(MAN1DIR) $(INSTALL_DATA) xentop.1 $(DESTDIR)$(MAN1DIR)/xentop.1 diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index 60c3a08..a4664ec 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -132,9 +132,9 @@ install: all $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xenstore-compat ifeq ($(XENSTORE_XENSTORED),y) - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) + $(INSTALL_DIR) $(DESTDIR)$(sbindir) $(INSTALL_DIR) $(DESTDIR)$(XEN_LIB_STORED) - $(INSTALL_PROG) xenstored $(DESTDIR)$(SBINDIR) + $(INSTALL_PROG) xenstored $(DESTDIR)$(sbindir) endif $(INSTALL_PROG) xenstore-control $(DESTDIR)$(BINDIR) $(INSTALL_PROG) xenstore $(DESTDIR)$(BINDIR) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxx http://lists.xensource.com/xen-changelog

©2013 Xen Project, A Linux Foundation Collaborative Project. All Rights Reserved.
Linux Foundation is a registered trademark of The Linux Foundation.
Xen Project is a trademark of The Linux Foundation.