[Xen-devel] [PATCH 22/46] tools: use INITD_DIR instead of CONFIG_DIR/init.d|rc.d

[Olaf Hering <olaf@xxxxxxxxx>]

Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
---
 Makefile                       | 4 ++--
 tools/hotplug/FreeBSD/Makefile | 4 ++--
 tools/hotplug/NetBSD/Makefile  | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 580df64..7558262 100644
--- a/Makefile
+++ b/Makefile
@@ -211,8 +211,8 @@ uninstall: D=$(DESTDIR)
 uninstall:
        [ -d $(D)$(XEN_CONFIG_DIR) ] && mv -f $(D)$(XEN_CONFIG_DIR) 
$(D)$(XEN_CONFIG_DIR).old-`date +%s` || true
        $(MAKE) -C xen uninstall
-       rm -rf $(D)$(CONFIG_DIR)/init.d/xendomains $(D)$(CONFIG_DIR)/init.d/xend
-       rm -rf $(D)$(CONFIG_DIR)/init.d/xencommons 
$(D)$(CONFIG_DIR)/init.d/xen-watchdog
+       rm -rf $(D)$(INITD_DIR)/xendomains $(D)$(INITD_DIR)/xend
+       rm -rf $(D)$(INITD_DIR)/xencommons $(D)$(INITD_DIR)/xen-watchdog
        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
diff --git a/tools/hotplug/FreeBSD/Makefile b/tools/hotplug/FreeBSD/Makefile
index 6480aa5..e21f046 100644
--- a/tools/hotplug/FreeBSD/Makefile
+++ b/tools/hotplug/FreeBSD/Makefile
@@ -31,10 +31,10 @@ install-scripts:
 
 .PHONY: install-rcd
 install-rcd:
-       $(INSTALL_DIR) $(DESTDIR)$(CONFIG_DIR)/rc.d
+       $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR)
        set -e; for i in $(XEN_RCD_PROG); \
           do \
-          $(INSTALL_PROG) $$i $(DESTDIR)$(CONFIG_DIR)/rc.d; \
+          $(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)
diff --git a/tools/hotplug/NetBSD/Makefile b/tools/hotplug/NetBSD/Makefile
index fc61162..9084859 100644
--- a/tools/hotplug/NetBSD/Makefile
+++ b/tools/hotplug/NetBSD/Makefile
@@ -33,12 +33,12 @@ install-scripts:
 
 .PHONY: install-rcd
 install-rcd:
-       $(INSTALL_DIR) $(DESTDIR)$(CONFIG_DIR)/rc.d
+       $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR)
        set -e; for i in $(XEN_RCD_PROG); \
           do \
-          $(INSTALL_PROG) $$i $(DESTDIR)$(CONFIG_DIR)/rc.d; \
+          $(INSTALL_PROG) $$i $(DESTDIR)$(INITD_DIR); \
        done
-       $(INSTALL_DATA) ../common/hotplugpath.sh 
$(DESTDIR)$(CONFIG_DIR)/rc.d/xen-hotplugpath.sh
+       $(INSTALL_DATA) ../common/hotplugpath.sh 
$(DESTDIR)$(INITD_DIR)/xen-hotplugpath.sh
 
 .PHONY: clean
 clean:

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel