[Xen-changelog] [xen-unstable] tools and Makefiles: introduce and use new SYSCONFIG_DIR variable

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Olaf Hering <olaf@xxxxxxxxx>
# Date 1279903805 -3600
# Node ID d4b48e74343172178d21e91fb23ae705e541394e
# Parent  1c1b02487b577e0dc78370f1a3d4c1d24c10cc04
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@xxxxxxxxx>
Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 config/StdGNU.mk             |    3 +++
 tools/hotplug/Linux/Makefile |    6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff -r 1c1b02487b57 -r d4b48e743431 config/StdGNU.mk
--- a/config/StdGNU.mk  Fri Jul 23 17:39:32 2010 +0100
+++ b/config/StdGNU.mk  Fri Jul 23 17:50:05 2010 +0100
@@ -48,6 +48,9 @@ else
 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 -r 1c1b02487b57 -r d4b48e743431 tools/hotplug/Linux/Makefile
--- a/tools/hotplug/Linux/Makefile      Fri Jul 23 17:39:32 2010 +0100
+++ b/tools/hotplug/Linux/Makefile      Fri Jul 23 17:50:05 2010 +0100
@@ -65,12 +65,12 @@ install: all install-initd install-scrip
 .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

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog