diff options
| author | Olaf Hering <olaf@aepfle.de> | 2010-07-23 17:50:05 +0100 |
|---|---|---|
| committer | Olaf Hering <olaf@aepfle.de> | 2010-07-23 17:50:05 +0100 |
| commit | cddbcd7143c4207fe2dff78df817d80e71a3bab3 (patch) | |
| tree | e846cbd59607304b5c91b756a0d15ef3b0e9249d | |
| parent | 5ba1a57d44cbec9122e921f2febd48255f607cd2 (diff) | |
| download | xen-cddbcd7143c4207fe2dff78df817d80e71a3bab3.tar.gz xen-cddbcd7143c4207fe2dff78df817d80e71a3bab3.tar.bz2 xen-cddbcd7143c4207fe2dff78df817d80e71a3bab3.zip | |
tools and Makefiles: introduce and use new SYSCONFIG_DIR variable
On SuSE the configuration files in /etc/sysconfig/ will be updated in
a smart way from templates found in /var/adm/fillup-templates/
Introduce new variable SYSCONFIG_DIR for Linux installations. Now
only one place needs patching, or it can be specified as option to
make(1).
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
| -rw-r--r-- | config/StdGNU.mk | 3 | ||||
| -rw-r--r-- | tools/hotplug/Linux/Makefile | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/config/StdGNU.mk b/config/StdGNU.mk index aa6248801e..9f957e8f17 100644 --- a/config/StdGNU.mk +++ b/config/StdGNU.mk @@ -48,6 +48,9 @@ CONFIG_DIR = /etc else CONFIG_DIR = $(PREFIX)/etc endif + +SYSCONFIG_DIR = $(CONFIG_DIR)/sysconfig + XEN_CONFIG_DIR = $(CONFIG_DIR)/xen XEN_SCRIPT_DIR = $(XEN_CONFIG_DIR)/scripts diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile index 19d88ab87d..1b7e8079b9 100644 --- a/tools/hotplug/Linux/Makefile +++ b/tools/hotplug/Linux/Makefile @@ -65,12 +65,12 @@ install: all install-initd install-scripts $(HOTPLUGS) .PHONY: install-initd install-initd: [ -d $(DESTDIR)$(CONFIG_DIR)/init.d ] || $(INSTALL_DIR) $(DESTDIR)$(CONFIG_DIR)/init.d - [ -d $(DESTDIR)$(CONFIG_DIR)/sysconfig ] || $(INSTALL_DIR) $(DESTDIR)$(CONFIG_DIR)/sysconfig + [ -d $(DESTDIR)$(SYSCONFIG_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(SYSCONFIG_DIR) $(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)$(CONFIG_DIR)/init.d $(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)$(CONFIG_DIR)/init.d - $(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)$(CONFIG_DIR)/sysconfig/xendomains + $(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)$(SYSCONFIG_DIR)/xendomains $(INSTALL_PROG) $(XENCOMMONS_INITD) $(DESTDIR)$(CONFIG_DIR)/init.d - $(INSTALL_PROG) $(XENCOMMONS_SYSCONFIG) $(DESTDIR)$(CONFIG_DIR)/sysconfig/xencommons + $(INSTALL_PROG) $(XENCOMMONS_SYSCONFIG) $(DESTDIR)$(SYSCONFIG_DIR)/xencommons $(INSTALL_PROG) init.d/xen-watchdog $(DESTDIR)$(CONFIG_DIR)/init.d .PHONY: install-scripts |