mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
tools/hotplug: substitute XEN_SCRIPT_DIR on FreeBSD
Also remove DESTDIR from the path, this was most likely not intended. Signed-off-by: Olaf Hering <olaf@aepfle.de> Acked-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Roger Pau Monné <roger.pau@citrix.com> Cc: Ian Campbell <ian.campbell@citrix.com> Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Cc: Wei Liu <wei.liu2@citrix.com> [ ijc -- ran autogen.sh as requested ]
This commit is contained in:
Olaf Hering authored and Ian Campbell committed
1 parent
50dc469852
commit
4bfb301f8f
5 files changed
+5
-3
No files matched your search
@@ -160,6 +160,7 @@ tools/flask/utils/flask-set-bool
|
||||
tools/flask/utils/flask-label-pci
|
||||
tools/fs-back/fs-backend
|
||||
tools/hotplug/common/hotplugpath.sh
|
||||
tools/hotplug/FreeBSD/rc.d/xencommons
|
||||
tools/hotplug/Linux/init.d/xen-watchdog
|
||||
tools/hotplug/Linux/init.d/xendomains
|
||||
tools/hotplug/Linux/vif-setup
|
||||
|
||||
Vendored
+2
-1
@@ -2263,7 +2263,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
|
||||
|
||||
ac_config_files="$ac_config_files ../config/Tools.mk hotplug/Linux/init.d/sysconfig.xencommons hotplug/Linux/init.d/xen-watchdog hotplug/Linux/init.d/xencommons.in hotplug/Linux/init.d/xendomains hotplug/Linux/systemd/proc-xen.mount hotplug/Linux/systemd/var-lib-xenstored.mount hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service hotplug/Linux/systemd/xen-watchdog.service hotplug/Linux/systemd/xenconsoled.service hotplug/Linux/systemd/xendomains.service hotplug/Linux/systemd/xenstored.service hotplug/Linux/systemd/xenstored.socket hotplug/Linux/systemd/xenstored_ro.socket hotplug/Linux/vif-setup hotplug/Linux/xen-backend.rules hotplug/Linux/xen-hotplug-common.sh hotplug/Linux/xendomains"
|
||||
ac_config_files="$ac_config_files ../config/Tools.mk hotplug/FreeBSD/rc.d/xencommons hotplug/Linux/init.d/sysconfig.xencommons hotplug/Linux/init.d/xen-watchdog hotplug/Linux/init.d/xencommons.in hotplug/Linux/init.d/xendomains hotplug/Linux/systemd/proc-xen.mount hotplug/Linux/systemd/var-lib-xenstored.mount hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service hotplug/Linux/systemd/xen-watchdog.service hotplug/Linux/systemd/xenconsoled.service hotplug/Linux/systemd/xendomains.service hotplug/Linux/systemd/xenstored.service hotplug/Linux/systemd/xenstored.socket hotplug/Linux/systemd/xenstored_ro.socket hotplug/Linux/vif-setup hotplug/Linux/xen-backend.rules hotplug/Linux/xen-hotplug-common.sh hotplug/Linux/xendomains"
|
||||
|
||||
ac_config_headers="$ac_config_headers config.h"
|
||||
|
||||
@@ -9514,6 +9514,7 @@ for ac_config_target in $ac_config_targets
|
||||
do
|
||||
case $ac_config_target in
|
||||
"../config/Tools.mk") CONFIG_FILES="$CONFIG_FILES ../config/Tools.mk" ;;
|
||||
"hotplug/FreeBSD/rc.d/xencommons") CONFIG_FILES="$CONFIG_FILES hotplug/FreeBSD/rc.d/xencommons" ;;
|
||||
"hotplug/Linux/init.d/sysconfig.xencommons") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/init.d/sysconfig.xencommons" ;;
|
||||
"hotplug/Linux/init.d/xen-watchdog") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/init.d/xen-watchdog" ;;
|
||||
"hotplug/Linux/init.d/xencommons.in") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/init.d/xencommons.in" ;;
|
||||
|
||||
@@ -7,6 +7,7 @@ AC_INIT([Xen Hypervisor Tools], m4_esyscmd([../version.sh ../xen/Makefile]),
|
||||
AC_CONFIG_SRCDIR([libxl/libxl.c])
|
||||
AC_CONFIG_FILES([
|
||||
../config/Tools.mk
|
||||
hotplug/FreeBSD/rc.d/xencommons
|
||||
hotplug/Linux/init.d/sysconfig.xencommons
|
||||
hotplug/Linux/init.d/xen-watchdog
|
||||
hotplug/Linux/init.d/xencommons.in
|
||||
|
||||
@@ -35,7 +35,6 @@ install-rcd:
|
||||
set -e; for i in $(XEN_RCD_PROG); \
|
||||
do \
|
||||
$(INSTALL_PROG) $$i $(DESTDIR)$(INITD_DIR); \
|
||||
sed -i '' 's,@xen_script_dir@,$(DESTDIR)$(XEN_SCRIPT_DIR),g' $(DESTDIR)$(CONFIG_DIR)/$$i; \
|
||||
done
|
||||
$(INSTALL_DATA) ../common/hotplugpath.sh $(DESTDIR)$(XEN_SCRIPT_DIR)
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
. /etc/rc.subr
|
||||
|
||||
. @xen_script_dir@/hotplugpath.sh
|
||||
. @XEN_SCRIPT_DIR@/hotplugpath.sh
|
||||
|
||||
LD_LIBRARY_PATH="${LIBDIR}"
|
||||
export LD_LIBRARY_PATH
|
||||