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@aepfle.de>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
Cc: Mukesh Rathor <mukesh.rathor@oracle.com>
Cc: Tim Deegan <tim@xen.org>
Cc: Daniel De Graaf <dgdegra@tycho.nsa.gov>
Cc: David Scott <dave.scott@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/Config.mk b/Config.mk
index 28b77d631574ec19557bb37b3cf58893f55376e4..abb1e44386255bba438feb0e164558d5c6d78a90 100644 (file)
--- 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 150bae7d0b11d9e3af89e2f204051e2f3ed30fd5..26674b13784a6a6d8b3a912c8d01a82e5913968a 100644 (file)
--- 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 966354acc285f416496c058ff88eb1980b70fddc..77625cb18c5ad7911c13cb898aa2e32c2b36fea0 100644 (file)
--- 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 1ae69021a4d492f2679a0eb783cd187d15887156..9ae2e51e44c2af69cc6c001a351e23b95ce09ddb 100644 (file)
--- 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 2f96c91b25009c2b5071b2d182a70b090f309b33..5328c402055970173c7eff1e861b93636415f72f 100644 (file)
--- 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 9e21cce810baccab540e04bec19c7a6e2e93c71e..fabd6654b321be4560e66ff4d0495c1c36265c1b 100644 (file)
--- 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 239ec60043605865015d0022c8562fb87da98ddd..71f80880b106ce8ac39aa6a187e26dffcdb89939 100644 (file)
--- 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 31eb9005b4b5a6ee5ee297ffab01c0ca15d2cb49..4ed6d76410a230ad70b8306587676765bbac8db0 100644 (file)
--- 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 8eafc82d382d00d46b8e7cab914d5b51565cfdcb..a79d7cfdf37d23d3db401b8288a41c3cb100f70d 100644 (file)
--- 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 5dfd271221931b20e560ee6f0970233e5687b0c7..91a53b44b83fcdc9cb73e26d403571fc10cba0b9 100644 (file)
--- 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 900990bad6608ec4b7c24d80849cb9c819b909c3..3e204d6237d9bef870ceff4af57e1ae25b08ccf4 100644 (file)
--- 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 062b20a8fa439d797326c1060a1d24ab2fdce7d7..3319710f12002f74efd8a7229dda28383a1aa6bd 100644 (file)
--- 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 32c7268d6e279579441fbe5fe30aab9efec31382..c05f1f6b6abfc8f9af2c9464edb64ffb2dae195c 100644 (file)
--- 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 a1095c29ce0f9ae23c7496814edf4fedbf589beb..82b3fcbfa553e04929eea00a893d5d7ff4f19a46 100644 (file)
--- 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 1deafe186b60e206b3fddfeab0b0955010e71667..f69888079dede15bf7c2da1aa7651d5d68065a67 100644 (file)
--- 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 2e65ac6adf042e1b0d989bae35410610af183d06..0603842a87bec27dc4a67fbbf2dd3c54daba5c9d 100644 (file)
--- 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 b2e9af54eb3a771b20acf600f8ef3638f94eec7f..3a78ea2d81b61caa44e44e9dee2a09b42d926af8 100644 (file)
--- 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 ff4a52c1340810d9eaa0fa4c81d75c8992877de0..0941fe7170be08f387b07b56d8be97b85578012a 100644 (file)
--- 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 db03f22ff23ccb3b071d23c1e298275eb436c8c2..82c217102f664d665ef70d759e5afdbb2888bf22 100644 (file)
--- 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 b0e7111d6425dee2527d577c11a8615ef59d062e..204a8f09d3ad20b7a6b86fbc059d9ab79346c8ad 100644 (file)
--- 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 960303e25395300a43cfbdef3e46fe8c6de31cbc..d6a2b162079a3c4f493b2d8e4bde32c2bbfb2bb0 100644 (file)
--- 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 28c43def1f393ba2ffabf9e9e5a12779b5201abc..fd60b7eacb7eb5c656f2fac00f8f5e0d20231216 100644 (file)
--- 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 2afb14634474a5ae9e147ad6aade82ef0e090527..8e5181e763b59e98d09dea90c6ad208e15b1e371 100644 (file)
--- 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 ccd36af49ecf529346ff881da2f36736130ac93f..a3007c2fd2787b97ce1922b991c3491398c7d147 100644 (file)
--- 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 48f1079401eb98b1f1e3763c2b73539b31400d87..bcf09d487e14f95d294662ee528bcb933ffac825 100644 (file)
--- 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 4a0db4963657db08049c6ba150a216d059f105bc..924e4ddbdf917660072ab219918b43ebcb32908c 100644 (file)
--- 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 b6bc160b1db19b393d2032fd434c34b8834f6fc5..f52be74f1323be5dded305e20f07f429d33c3162 100644 (file)
--- 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 c206d9475b210eb8ba655aeac3801635b73f0b90..a676d3236dd740de627f834ecfecead819b03046 100644 (file)
--- 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 4605261d268989ddc7dbf020c585f05edc0dad4e..55e8fc5f0f5a74341c1444b27b5186eac12d6aee 100644 (file)
--- 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 5376fdc3b105be2c60af8ab70c1b8135ac08f0b9..2652c9dac55a83f7386972a9243338aacd1471d7 100644 (file)
--- 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 60c3a0872a8b54711a93d42e9076825c0b3e73d0..a4664ec2ed5e353dea4f4d5af9e6d23c7906ec65 100644 (file)
--- 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)