Use configure --libexecdir=BASEDIR to set LIBEXEC

The current usage of LIBEXEC is bogus. It describes the directory for
private xen executables. Other places create their own, similar
libexecdir path as $prefix/lib/xen/*.

Additional two other variables are used to describe similar paths:
PRIVATE_BINDIR and PRIVATE_PREFIX

The autoconf documentation refers to libexec as a directory for
executables and stuff which is called by other programs, not by the
user.

Adjust all places that want libexecdir as a target path. LIBEXEC refers
now to the base directory. Three convenience variables are used to refer
to paths to private binaries, libs and include files.

In the systemd files LIBEXEC_BIN is substituted, so this variable has to
be present in autoconf. All other variables are expanded in Paths.mk
because they are only used in Makefiles.

Most users of LIBEXEC are updated to use LIBEXEC_BIN because that is
what they want.

Users of PRIVATE_BINDIR are updated to use LIBEXEC_BIN because that is
what they want. PRIVATE_BINDIR and PRIVATE_PREFIX usage is removed by
this patch, in favour of LIBXEC_BIN and LIBEXEC

An internal libxl function was removed. A single helper to retrieve
LIBEXEC_BIN remains.

As suggested by the autoconf documentation, configure appends the
package name to LIBEXEC to make sure the provided directory really
refers to xen. This makes sure "make uninstall" preserves the real
libexecdir.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Cc: George Dunlap <george.dunlap@eu.citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
[ ijc -- ran autogen.sh as requested, updated QEMU_TRADITIONAL_REVISION to
         pickup version which uses LIBEXEC_BIN ]

diff --git a/Config.mk b/Config.mk
index 569f4abfb9df8898be788d23a6234572327067ba..e551339c37487c5b83c7bb2b715c32bf5d95e0a3 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -162,7 +162,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 LIBDIR SHAREDIR PRIVATE_BINDIR \
+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
 
@@ -262,9 +262,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5
 ETHERBOOT_NICS ?= rtl8139 8086100e
 
 
-QEMU_TRADITIONAL_REVISION ?= 58fac0693d8ad591add917e939011fe069720b0c
-# Fri Aug 1 16:32:18 2014 +0100
-# qemu-xen-trad: -I tools/libxc/include and tools/xenstore/include
+QEMU_TRADITIONAL_REVISION ?= b0d42741f8e9a00854c3b3faca1da84bfc69bf22
+# Mon Oct 6 16:24:46 2014 +0100
+# qemu-xen-trad: Switch to $(LIBEXEC_BIN) from $(LIBEXEC)
 
 # Specify which qemu-dm to use. This may be `ioemu' to use the old
 # Mercurial in-tree version, or a local directory, or a git URL.

diff --git a/config/Paths.mk.in b/config/Paths.mk.in
index 2151c14b2fb5730d1d40c3580aaf9e29bf005715..875578507ce3864e1f691529dca6f80e94953615 100644 (file)
--- a/config/Paths.mk.in
+++ b/config/Paths.mk.in
@@ -31,7 +31,10 @@ sysconfdir               := @sysconfdir@
 
 SBINDIR                  := $(sbindir)
 BINDIR                   := $(bindir)
-LIBEXEC                  := @LIBEXEC@
+LIBEXEC                  := $(libexecdir)/$(PACKAGE_TARNAME)
+LIBEXEC_BIN              := @LIBEXEC_BIN@
+LIBEXEC_LIB              := $(LIBEXEC)/lib
+LIBEXEC_INC              := $(LIBEXEC)/include
 
 INCLUDEDIR               := $(includedir)
 SHAREDIR                 := @SHAREDIR@
@@ -50,9 +53,6 @@ INITD_DIR                := @INITD_DIR@
 XEN_LOCK_DIR             := @XEN_LOCK_DIR@
 XEN_PAGING_DIR           := @XEN_PAGING_DIR@
 
-PRIVATE_PREFIX           := @PRIVATE_PREFIX@
-PRIVATE_BINDIR           := @PRIVATE_BINDIR@
-
 XENFIRMWAREDIR           := @XENFIRMWAREDIR@
 
 XEN_CONFIG_DIR           := @XEN_CONFIG_DIR@

diff --git a/configure b/configure
index d24d1636b4d813ef672a301a57010657e5a22c04..57639cbb51f3b49b4cc1a0e3575d624f250a189e 100755 (executable)
--- a/configure
+++ b/configure
@@ -601,13 +601,11 @@ XEN_CONFIG_DIR
 INITD_DIR
 CONFIG_DIR
 XENFIRMWAREDIR
-PRIVATE_BINDIR
-PRIVATE_PREFIX
 SHAREDIR
 XEN_LIB_STORED
 XEN_LOG_DIR
 XEN_RUN_DIR
-LIBEXEC
+LIBEXEC_BIN
 host_os
 host_vendor
 host_cpu
@@ -1897,10 +1895,16 @@ else
 fi
 
 
-case "$host_os" in
-*netbsd*)  LIBEXEC=$prefix/libexec ;;
-*) LIBEXEC=$prefix/lib/xen/bin ;;
-esac
+if test "$libexecdir" = '${exec_prefix}/libexec' ; then
+    case "$host_os" in
+         *netbsd*) ;;
+         *)
+         libexecdir='${exec_prefix}/lib'
+         ;;
+    esac
+fi
+libexecdir=`eval echo $libexecdir`
+LIBEXEC_BIN=`eval echo $libexecdir/$PACKAGE_TARNAME/bin`
 
 
 XEN_RUN_DIR=/var/run/xen
@@ -1915,16 +1919,6 @@ XEN_LIB_STORED=/var/lib/xenstored
 SHAREDIR=$prefix/share
 
 
-PRIVATE_PREFIX=`eval echo $libdir`
-
-
-case "$host_os" in
-*freebsd*) PRIVATE_BINDIR=$PRIVATE_PREFIX/bin ;;
-*netbsd*) PRIVATE_BINDIR=$BINDIR ;;
-*) PRIVATE_BINDIR=$PRIVATE_PREFIX/bin ;;
-esac
-
-
 XENFIRMWAREDIR=$prefix/lib/xen/boot
 
 

diff --git a/m4/paths.m4 b/m4/paths.m4
index a9c6ebd23b774f7418aebf191edfd472aff2f474..b7b351cfa6e14876d1ded6d99280c3be02ec2a1b 100644 (file)
--- a/m4/paths.m4
+++ b/m4/paths.m4
@@ -43,13 +43,20 @@ AC_ARG_WITH([initddir],
          ;;
      esac])
 
-dnl XXX: this should be changed to use the passed $libexec
-dnl but can be done as a second step
-case "$host_os" in
-*netbsd*)  LIBEXEC=$prefix/libexec ;;
-*) LIBEXEC=$prefix/lib/xen/bin ;;
-esac
-AC_SUBST(LIBEXEC)
+if test "$libexecdir" = '${exec_prefix}/libexec' ; then
+    case "$host_os" in
+         *netbsd*) ;;
+         *)
+         libexecdir='${exec_prefix}/lib'
+         ;;
+    esac
+fi
+dnl expand exec_prefix or it will endup in substituted variables
+libexecdir=`eval echo $libexecdir`
+dnl autoconf doc suggest to use a "package name" subdir
+dnl This variable will be substituted in various .in files
+LIBEXEC_BIN=`eval echo $libexecdir/$PACKAGE_TARNAME/bin`
+AC_SUBST(LIBEXEC_BIN)
 
 XEN_RUN_DIR=/var/run/xen
 AC_SUBST(XEN_RUN_DIR)
@@ -63,16 +70,6 @@ AC_SUBST(XEN_LIB_STORED)
 SHAREDIR=$prefix/share
 AC_SUBST(SHAREDIR)
 
-PRIVATE_PREFIX=`eval echo $libdir`
-AC_SUBST(PRIVATE_PREFIX)
-
-case "$host_os" in
-*freebsd*) PRIVATE_BINDIR=$PRIVATE_PREFIX/bin ;;
-*netbsd*) PRIVATE_BINDIR=$BINDIR ;;
-*) PRIVATE_BINDIR=$PRIVATE_PREFIX/bin ;;
-esac
-AC_SUBST(PRIVATE_BINDIR)
-
 XENFIRMWAREDIR=$prefix/lib/xen/boot
 AC_SUBST(XENFIRMWAREDIR)
 

diff --git a/stubdom/Makefile b/stubdom/Makefile
index 81f6d5ab91dbd2353b595b7a251f10c338fc66e0..9dac10398161379a9ddc11f4578035422188dd97 100644 (file)
--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -462,9 +462,9 @@ install-readme:
        $(INSTALL_DATA) README $(DESTDIR)$(DOCDIR)/README.stubdom
 
 install-ioemu: ioemu-stubdom
-       $(INSTALL_DIR) "$(DESTDIR)$(LIBEXEC)"
-       $(INSTALL_PROG) stubdom-dm "$(DESTDIR)$(LIBEXEC)"
-       $(INSTALL_DATA) stubdompath.sh "$(DESTDIR)$(LIBEXEC)"
+       $(INSTALL_DIR) "$(DESTDIR)$(LIBEXEC_BIN)"
+       $(INSTALL_PROG) stubdom-dm "$(DESTDIR)$(LIBEXEC_BIN)"
+       $(INSTALL_DATA) stubdompath.sh "$(DESTDIR)$(LIBEXEC_BIN)"
        $(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)"
        $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-ioemu/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/ioemu-stubdom.gz"
 

diff --git a/tools/Makefile b/tools/Makefile
index 99e5694af8d8b6f2b4bda7fdbec3e0e2ec7c17aa..fced43792a785a04ad7085838fe75570692648b2 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -94,8 +94,7 @@ uninstall:
        rm -rf $(D)$(LIBDIR)/libxenctrl* $(D)$(LIBDIR)/libxenguest*
        rm -rf $(D)$(LIBDIR)/libxenstore* $(D)$(LIBDIR)/libxlutil*
        rm -rf $(D)$(LIBDIR)/python/xen $(D)$(LIBDIR)/python/grub
-       rm -rf $(D)$(LIBDIR)/xen/
-       rm -rf $(D)$(LIBEXEC)/xen*
+       rm -rf $(D)$(LIBEXEC)
        rm -rf $(D)$(SBINDIR)/setmask
        rm -rf $(D)$(SBINDIR)/xen* $(D)$(SBINDIR)/netfix $(D)$(SBINDIR)/xm
        rm -rf $(D)$(SHAREDIR)/doc/xen
@@ -196,9 +195,9 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
        cd qemu-xen-dir; \
        $$source/configure --enable-xen --target-list=i386-softmmu \
                $(QEMU_XEN_ENABLE_DEBUG) \
-               --prefix=$(PREFIX)/lib/xen \
-               --libdir=$(PREFIX)/lib/xen/lib \
-               --includedir=$(PREFIX)/lib/xen/include \
+               --prefix=$(LIBEXEC) \
+               --libdir=$(LIBEXEC_LIB) \
+               --includedir=$(LIBEXEC_INC) \
                --source-path=$$source \
                --extra-cflags="-I$(XEN_ROOT)/tools/include \
                -I$(XEN_ROOT)/tools/libxc/include \
@@ -208,7 +207,7 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
                --extra-ldflags="-L$(XEN_ROOT)/tools/libxc \
                -L$(XEN_ROOT)/tools/xenstore \
                -Wl,-rpath=$(PREFIX)/lib/xen/lib" \
-               --bindir=$(LIBEXEC) \
+               --bindir=$(LIBEXEC_BIN) \
                --datadir=$(SHAREDIR)/qemu-xen \
                --localstatedir=/var \
                --disable-kvm \

diff --git a/tools/configure b/tools/configure
index f18a579de8e2b40858ccb35eafb30e00019edb39..52b82f6a640f939758cc0269049d168e8b64d7a6 100755 (executable)
--- a/tools/configure
+++ b/tools/configure
@@ -714,13 +714,11 @@ XEN_CONFIG_DIR
 INITD_DIR
 CONFIG_DIR
 XENFIRMWAREDIR
-PRIVATE_BINDIR
-PRIVATE_PREFIX
 SHAREDIR
 XEN_LIB_STORED
 XEN_LOG_DIR
 XEN_RUN_DIR
-LIBEXEC
+LIBEXEC_BIN
 FILE_OFFSET_BITS
 OBJEXT
 EXEEXT
@@ -3732,10 +3730,16 @@ else
 fi
 
 
-case "$host_os" in
-*netbsd*)  LIBEXEC=$prefix/libexec ;;
-*) LIBEXEC=$prefix/lib/xen/bin ;;
-esac
+if test "$libexecdir" = '${exec_prefix}/libexec' ; then
+    case "$host_os" in
+         *netbsd*) ;;
+         *)
+         libexecdir='${exec_prefix}/lib'
+         ;;
+    esac
+fi
+libexecdir=`eval echo $libexecdir`
+LIBEXEC_BIN=`eval echo $libexecdir/$PACKAGE_TARNAME/bin`
 
 
 XEN_RUN_DIR=/var/run/xen
@@ -3750,16 +3754,6 @@ XEN_LIB_STORED=/var/lib/xenstored
 SHAREDIR=$prefix/share
 
 
-PRIVATE_PREFIX=`eval echo $libdir`
-
-
-case "$host_os" in
-*freebsd*) PRIVATE_BINDIR=$PRIVATE_PREFIX/bin ;;
-*netbsd*) PRIVATE_BINDIR=$BINDIR ;;
-*) PRIVATE_BINDIR=$PRIVATE_PREFIX/bin ;;
-esac
-
-
 XENFIRMWAREDIR=$prefix/lib/xen/boot
 
 

diff --git a/tools/console/Makefile b/tools/console/Makefile
index 3e38252d10568ecaa7471f470a560bc12b42585b..6e5561853abe55e840432da860740aa31a91e7ce 100644 (file)
--- a/tools/console/Makefile
+++ b/tools/console/Makefile
@@ -32,7 +32,7 @@ xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c))
 install: $(BIN)
        $(INSTALL_DIR) $(DESTDIR)/$(SBINDIR)
        $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(SBINDIR)
-       $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
-       $(INSTALL_PROG) xenconsole $(DESTDIR)$(PRIVATE_BINDIR)
+       $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
+       $(INSTALL_PROG) xenconsole $(DESTDIR)$(LIBEXEC_BIN)
 
 -include $(DEPS)

diff --git a/tools/hotplug/FreeBSD/rc.d/xencommons.in b/tools/hotplug/FreeBSD/rc.d/xencommons.in
index 8b051ecffca0570fdde142dfdaec85cd824de3e7..c73616e4df71779a33dddb71b5134c928657255b 100644 (file)
--- a/tools/hotplug/FreeBSD/rc.d/xencommons.in
+++ b/tools/hotplug/FreeBSD/rc.d/xencommons.in
@@ -65,7 +65,7 @@ xen_startcmd()
        printf "\n"
 
        printf "Setting domain 0 name, domid and JSON config...\n"
-       ${PRIVATE_BINDIR}/xen-init-dom0
+       ${LIBEXEC_BIN}/xen-init-dom0
 }
 
 xen_stop()

diff --git a/tools/hotplug/FreeBSD/vif-bridge b/tools/hotplug/FreeBSD/vif-bridge
index fa7570d771a6ff2e416361148068e442c2a640f9..d350df4ce27d8fc16661e5274cf6725e044c22c9 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}:${PRIVATE_BINDIR}:/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/Makefile b/tools/hotplug/Linux/Makefile
index 5317feff260e6808044974df778f52749885eb21..184f56dd0105d9a98747b62f3b1b9883b69f4110 100644 (file)
--- a/tools/hotplug/Linux/Makefile
+++ b/tools/hotplug/Linux/Makefile
@@ -56,8 +56,8 @@ install: all install-initd install-scripts install-udev subdirs-install
 install-initd: all
        [ -d $(DESTDIR)$(INITD_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR)
        [ -d $(DESTDIR)$(SYSCONFIG_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(SYSCONFIG_DIR)
-       [ -d $(DESTDIR)$(LIBEXEC) ] || $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC)
-       $(INSTALL_PROG) $(XENDOMAINS_LIBEXEC) $(DESTDIR)$(LIBEXEC)
+       [ -d $(DESTDIR)$(LIBEXEC_BIN) ] || $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
+       $(INSTALL_PROG) $(XENDOMAINS_LIBEXEC) $(DESTDIR)$(LIBEXEC_BIN)
        $(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)$(INITD_DIR)
        $(INSTALL_DATA) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)$(SYSCONFIG_DIR)/xendomains
        $(INSTALL_PROG) $(XENCOMMONS_INITD) $(DESTDIR)$(INITD_DIR)

diff --git a/tools/hotplug/Linux/init.d/sysconfig.xencommons.in b/tools/hotplug/Linux/init.d/sysconfig.xencommons.in
index 4d76d6b99ed738574ed30a97ef7b13e671363034..432208176edfedc2696e9318dfad683bd36f9bf2 100644 (file)
--- a/tools/hotplug/Linux/init.d/sysconfig.xencommons.in
+++ b/tools/hotplug/Linux/init.d/sysconfig.xencommons.in
@@ -39,4 +39,4 @@
 #XENBACKENDD_DEBUG=[yes|on|1]
 
 # qemu path
-#QEMU_XEN=/usr/lib/xen/bin/qemu-system-i386
+#QEMU_XEN=@LIBEXEC_BIN@/qemu-system-i386

diff --git a/tools/hotplug/Linux/init.d/xencommons.in.in b/tools/hotplug/Linux/init.d/xencommons.in.in
index bd1d9ba5388d978616f7d108fece709a241275ef..590f7450453d02bffab2579c60d36b58e2cf61b5 100644 (file)
--- a/tools/hotplug/Linux/init.d/xencommons.in.in
+++ b/tools/hotplug/Linux/init.d/xencommons.in.in
@@ -92,14 +92,14 @@ do_start () {
                fi
 
                echo Setting domain 0 name, domid and JSON config...
-               ${PRIVATE_BINDIR}/xen-init-dom0
+               ${LIBEXEC_BIN}/xen-init-dom0
        fi
 
        echo Starting xenconsoled...
        test -z "$XENCONSOLED_TRACE" || XENCONSOLED_ARGS=" --log=$XENCONSOLED_TRACE"
        ${SBINDIR}/xenconsoled --pid-file=$XENCONSOLED_PIDFILE $XENCONSOLED_ARGS
        echo Starting QEMU as disk backend for dom0
-       test -z "$QEMU_XEN" && QEMU_XEN="${LIBEXEC}/qemu-system-i386"
+       test -z "$QEMU_XEN" && QEMU_XEN="${LIBEXEC_BIN}/qemu-system-i386"
        $QEMU_XEN -xen-domid 0 -xen-attach -name dom0 -nographic -M xenpv -daemonize \
                -monitor /dev/null -serial /dev/null -parallel /dev/null \
                -pidfile $QEMU_PIDFILE

diff --git a/tools/hotplug/Linux/init.d/xendomains.in b/tools/hotplug/Linux/init.d/xendomains.in
index 5b88e2d9ee191c89e908ced3fd68de27a8476e57..dcd330cb8d5df137b493848bcde0b86f62c4acb1 100644 (file)
--- a/tools/hotplug/Linux/init.d/xendomains.in
+++ b/tools/hotplug/Linux/init.d/xendomains.in
@@ -20,7 +20,7 @@
 # Short-Description: Wrapper to start/stop secondary xen domains
 # Description:       Wrapper for starting / stopping domains automatically
 #                    when domain 0 boots / shuts down on systems using init.
-#                    The $LIBEXEC/xendomains helper is shared between init and
+#                    The $LIBEXEC_BIN/xendomains helper is shared between init and
 #                    systemd systems.
 ### END INIT INFO
 
@@ -28,19 +28,19 @@
 
 case "$1" in
     start)
-       $LIBEXEC/xendomains start
+       $LIBEXEC_BIN/xendomains start
        ;;
     stop)
-       $LIBEXEC/xendomains stop
+       $LIBEXEC_BIN/xendomains stop
        ;;
     restart)
-       $LIBEXEC/xendomains restart
+       $LIBEXEC_BIN/xendomains restart
        ;;
     reload)
-       $LIBEXEC/xendomains reload
+       $LIBEXEC_BIN/xendomains reload
        ;;
     status)
-       $LIBEXEC/xendomains status
+       $LIBEXEC_BIN/xendomains status
        ;;
     *)
        echo "Usage: $0 {start|stop|restart|reload|status}"

diff --git a/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in b/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in
index 8dbd110dd3e9c24ea3e59502c2995688b16bddb0..806bcaaf65450deac982d7e3f047e8d3c74494f6 100644 (file)
--- a/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in
+++ b/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in
@@ -13,7 +13,7 @@ EnvironmentFile=-/etc/sysconfig/xenstored
 PIDFile=@XEN_RUN_DIR@/qemu-dom0.pid
 ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities
 ExecStartPre=/bin/mkdir -p /var/run/xen
-ExecStart=@LIBEXEC@/qemu-system-i386 -xen-domid 0 \
+ExecStart=@LIBEXEC_BIN@/qemu-system-i386 -xen-domid 0 \
        -xen-attach -name dom0 -nographic -M xenpv -daemonize \
        -monitor /dev/null -serial /dev/null -parallel /dev/null \
        -pidfile @XEN_RUN_DIR@/qemu-dom0.pid

diff --git a/tools/hotplug/Linux/systemd/xendomains.service.in b/tools/hotplug/Linux/systemd/xendomains.service.in
index 70ce7c06d274c67721c250fcf3bf94e21f8aa365..f88c3366602e725b5ee22c1b7578f7e4369b0666 100644 (file)
--- a/tools/hotplug/Linux/systemd/xendomains.service.in
+++ b/tools/hotplug/Linux/systemd/xendomains.service.in
@@ -8,9 +8,9 @@ ConditionVirtualization=xen
 Type=oneshot
 RemainAfterExit=true
 ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities
-ExecStart=-@LIBEXEC@/xendomains start
-ExecStop=@LIBEXEC@/xendomains stop
-ExecReload=@LIBEXEC@/xendomains restart
+ExecStart=-@LIBEXEC_BIN@/xendomains start
+ExecStop=@LIBEXEC_BIN@/xendomains stop
+ExecReload=@LIBEXEC_BIN@/xendomains restart
 
 [Install]
 WantedBy=multi-user.target

diff --git a/tools/hotplug/Linux/xen-hotplug-common.sh.in b/tools/hotplug/Linux/xen-hotplug-common.sh.in
index 996e974973ff7e21a2cd748b58aefb8963d1c544..1deafe186b60e206b3fddfeab0b0955010e71667 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}:${PRIVATE_BINDIR}:/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/NetBSD/block b/tools/hotplug/NetBSD/block
index f1146b51c1eb605ee03221812a9a5189cf555d67..b2e9af54eb3a771b20acf600f8ef3638f94eec7f 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}:${PRIVATE_BINDIR}:/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/xencommons b/tools/hotplug/NetBSD/rc.d/xencommons
index 7ac87e2e89de19317a91487f0a9f609853f2c84d..793bede6817affa86e379e4c4ed6c494989fdeaf 100644 (file)
--- a/tools/hotplug/NetBSD/rc.d/xencommons
+++ b/tools/hotplug/NetBSD/rc.d/xencommons
@@ -69,7 +69,7 @@ xen_startcmd()
        printf "\n"
 
        printf "Setting domain 0 name, domid and JSON config...\n"
-       ${PRIVATE_BINDIR}/xen-init-dom0
+       ${LIBEXEC_BIN}/xen-init-dom0
 }
 
 xen_stop()

diff --git a/tools/hotplug/NetBSD/vif-bridge b/tools/hotplug/NetBSD/vif-bridge
index 64162a8809498e7b1a7b627bdeb02796c1ebeb2c..960303e25395300a43cfbdef3e46fe8c6de31cbc 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}:${PRIVATE_BINDIR}:/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 583e2773180245ec285cc0bd24a8b9cc79c102cd..28c43def1f393ba2ffabf9e9e5a12779b5201abc 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}:${PRIVATE_BINDIR}:/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 7bfcdd9d85d5721a0ce7362014ff1cc08722a926..0bf666f5ebb150a898107eb82c4b413140f3a958 100644 (file)
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -254,10 +254,10 @@ install: all
        $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
        $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
        $(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR)
-       $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
+       $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
        $(INSTALL_PROG) xl $(DESTDIR)$(SBINDIR)
-       $(INSTALL_PROG) xen-init-dom0 $(DESTDIR)$(PRIVATE_BINDIR)
-       $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(PRIVATE_BINDIR)
+       $(INSTALL_PROG) xen-init-dom0 $(DESTDIR)$(LIBEXEC_BIN)
+       $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(LIBEXEC_BIN)
        $(INSTALL_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
        $(SYMLINK_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenlight.so.$(MAJOR)
        $(SYMLINK_SHLIB) libxenlight.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenlight.so

diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
index 0018113f555100b9da748031109aa1a119a2fb7b..d8992bb96e4f3fb52a697c24dec26312e2527708 100644 (file)
--- a/tools/libxl/libxl_dm.c
+++ b/tools/libxl/libxl_dm.c
@@ -38,7 +38,7 @@ static const char *qemu_xen_path(libxl__gc *gc)
 #ifdef QEMU_XEN_PATH
     return QEMU_XEN_PATH;
 #else
-    return libxl__abs_path(gc, "qemu-system-i386", libxl__libexec_path());
+    return libxl__abs_path(gc, "qemu-system-i386", libxl__private_bindir_path());
 #endif
 }
 
@@ -73,7 +73,7 @@ const char *libxl__domain_device_model(libxl__gc *gc,
     } else {
         switch (info->device_model_version) {
         case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL:
-            dm = libxl__abs_path(gc, "qemu-dm", libxl__libexec_path());
+            dm = libxl__abs_path(gc, "qemu-dm", libxl__private_bindir_path());
             break;
         case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN:
             dm = qemu_xen_path(gc);

diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index b87c5e218915983e52bae415ea58f10986087468..83bef5905e6dceb324c9f03bb6894ce8e2eb7d9e 100644 (file)
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -2070,7 +2070,6 @@ _hidden int libxl__carefd_close(libxl__carefd*);
 _hidden int libxl__carefd_fd(const libxl__carefd*);
 
 /* common paths */
-_hidden const char *libxl__libexec_path(void);
 _hidden const char *libxl__private_bindir_path(void);
 _hidden const char *libxl__xenfirmwaredir_path(void);
 _hidden const char *libxl__xen_config_dir_path(void);

diff --git a/tools/libxl/libxl_paths.c b/tools/libxl/libxl_paths.c
index 14b28d1982521476b5994b12389eb4ebe8f0af07..9b7b0d5b0e3a32838627bb2a73e0cb8068c579a1 100644 (file)
--- a/tools/libxl/libxl_paths.c
+++ b/tools/libxl/libxl_paths.c
@@ -15,14 +15,9 @@
 #include "libxl_osdeps.h" /* must come before any other headers */
 #include "libxl_internal.h"
 
-const char *libxl__libexec_path(void)
-{
-    return LIBEXEC;
-}
-
 const char *libxl__private_bindir_path(void)
 {
-    return PRIVATE_BINDIR;
+    return LIBEXEC_BIN;
 }
 
 const char *libxl__xenfirmwaredir_path(void)

diff --git a/tools/libxl/libxl_save_callout.c b/tools/libxl/libxl_save_callout.c
index 1c9f8069240d8dd2938f1e0f7c4b5136cc2b15a4..40b25e4bed1c0df3b578fbbf8dcf448e5e40e7e1 100644 (file)
--- a/tools/libxl/libxl_save_callout.c
+++ b/tools/libxl/libxl_save_callout.c
@@ -174,7 +174,7 @@ static void run_helper(libxl__egc *egc, libxl__save_helper_state *shs,
     shs->stdout_what = GCSPRINTF("domain %"PRIu32" save/restore helper"
                                  " stdout pipe", domid);
 
-    *arg++ = getenv("LIBXL_SAVE_HELPER") ?: PRIVATE_BINDIR "/" "libxl-save-helper";
+    *arg++ = getenv("LIBXL_SAVE_HELPER") ?: LIBEXEC_BIN "/" "libxl-save-helper";
     *arg++ = mode_arg;
     const char **stream_fd_arg = arg++;
     for (i=0; i<num_argnums; i++)

diff --git a/tools/misc/Makefile b/tools/misc/Makefile
index 266fd167d80e18ebf1bdc7e8a58059a227a04d57..3237461a4ac2982681bf8c411d5d63f2c37cf10b 100644 (file)
--- a/tools/misc/Makefile
+++ b/tools/misc/Makefile
@@ -45,10 +45,10 @@ build: $(TARGETS)
 install: build
        $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
        $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
-       $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
+       $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
        $(INSTALL_PYTHON_PROG) $(INSTALL_BIN) $(DESTDIR)$(BINDIR)
        $(INSTALL_PYTHON_PROG) $(INSTALL_SBIN) $(DESTDIR)$(SBINDIR)
-       $(INSTALL_PYTHON_PROG) $(INSTALL_PRIVBIN) $(DESTDIR)$(PRIVATE_BINDIR)
+       $(INSTALL_PYTHON_PROG) $(INSTALL_PRIVBIN) $(DESTDIR)$(LIBEXEC_BIN)
        set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d install-recurse; done
 
 .PHONY: clean

diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
index a37a8b12901a971b8cfadb7e6a798b0caeb73a1e..3dff608aac45e58da0436c88bdb7f9099febb4e8 100644 (file)
--- a/tools/pygrub/Makefile
+++ b/tools/pygrub/Makefile
@@ -12,11 +12,11 @@ build:
 install: all
        CC="$(CC)" CFLAGS="$(CFLAGS) $(APPEND_LDFLAGS)" $(PYTHON) setup.py install \
                $(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" \
-               --install-scripts=$(PRIVATE_BINDIR) --force
-       set -e; if [ $(BINDIR) != $(PRIVATE_BINDIR) -a \
+               --install-scripts=$(LIBEXEC_BIN) --force
+       set -e; if [ $(BINDIR) != $(LIBEXEC_BIN) -a \
                     "`readlink -f $(DESTDIR)/$(BINDIR)`" != \
-                    "`readlink -f $(PRIVATE_BINDIR)`" ]; then \
-           ln -sf $(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR); \
+                    "`readlink -f $(LIBEXEC_BIN)`" ]; then \
+           ln -sf $(LIBEXEC_BIN)/pygrub $(DESTDIR)/$(BINDIR); \
        fi
 
 .PHONY: clean

diff --git a/tools/vtpmmgr/Makefile b/tools/vtpmmgr/Makefile
index 8890b06931b610208d848df65bb49ec25caad10b..b14c1700b084efb545557123ede12f4f767127c6 100644 (file)
--- a/tools/vtpmmgr/Makefile
+++ b/tools/vtpmmgr/Makefile
@@ -5,9 +5,9 @@ all:
        @true
 
 install:
-       $(INSTALL_DIR) "$(DESTDIR)$(LIBEXEC)"
-       $(INSTALL_DATA) calc.pl "$(DESTDIR)$(LIBEXEC)"
-       $(INSTALL_DATA) manage-vtpmmgr.pl "$(DESTDIR)$(LIBEXEC)"
+       $(INSTALL_DIR) "$(DESTDIR)$(LIBEXEC_BIN)"
+       $(INSTALL_DATA) calc.pl "$(DESTDIR)$(LIBEXEC_BIN)"
+       $(INSTALL_DATA) manage-vtpmmgr.pl "$(DESTDIR)$(LIBEXEC_BIN)"
 
 clean:
        @true

diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile
index f71703ddaca2783bb1a6e419634a1e8a9218361d..1c5237c551b7460a955fdc1d9ce9c1cc4e4cc6d4 100644 (file)
--- a/tools/xcutils/Makefile
+++ b/tools/xcutils/Makefile
@@ -33,8 +33,8 @@ lsevtchn: lsevtchn.o
 
 .PHONY: install
 install: build
-       $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
-       $(INSTALL_PROG) $(PROGRAMS) $(DESTDIR)$(PRIVATE_BINDIR)
+       $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
+       $(INSTALL_PROG) $(PROGRAMS) $(DESTDIR)$(LIBEXEC_BIN)
 
 
 .PHONY: clean

diff --git a/tools/xenpaging/Makefile b/tools/xenpaging/Makefile
index 3734ca612712a51316b4cddb673f032c5ac62170..c742e6271a11438a4fcc4c8130193c503c83cd90 100644 (file)
--- a/tools/xenpaging/Makefile
+++ b/tools/xenpaging/Makefile
@@ -25,8 +25,8 @@ xenpaging: $(OBJS)
 
 install: all
        $(INSTALL_DIR) -m 0700 $(DESTDIR)$(XEN_PAGING_DIR)
-       $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC)
-       $(INSTALL_PROG) $(IBINS) $(DESTDIR)$(LIBEXEC)
+       $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
+       $(INSTALL_PROG) $(IBINS) $(DESTDIR)$(LIBEXEC_BIN)
 
 clean:
        rm -f *.o *~ $(DEPS) xen TAGS $(IBINS) $(LIB)

diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile
index 63b09c0f1c5ce2038daa0a18ccb2231bbe40128a..b821952643ec02cf511a26e79eb3eac28040bd17 100644 (file)
--- a/tools/xentrace/Makefile
+++ b/tools/xentrace/Makefile
@@ -21,12 +21,12 @@ build: $(BIN) $(LIBBIN)
 .PHONY: install
 install: build
        $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
-       [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
+       [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
        $(INSTALL_DIR) $(DESTDIR)$(MAN1DIR)
        $(INSTALL_DIR) $(DESTDIR)$(MAN8DIR)
        $(INSTALL_PROG) $(BIN) $(DESTDIR)$(BINDIR)
        $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(BINDIR)
-       [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(PRIVATE_BINDIR)
+       [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBEXEC_BIN)
        $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1DIR)
        $(INSTALL_DATA) $(MAN8) $(DESTDIR)$(MAN8DIR)