debuggers.hg

changeset 21896:d4b48e743431

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>
author Olaf Hering <olaf@aepfle.de>
date Fri Jul 23 17:50:05 2010 +0100 (2010-07-23)
parents 1c1b02487b57
children a87badebeb2b
files config/StdGNU.mk tools/hotplug/Linux/Makefile
line diff
     1.1 --- a/config/StdGNU.mk	Fri Jul 23 17:39:32 2010 +0100
     1.2 +++ b/config/StdGNU.mk	Fri Jul 23 17:50:05 2010 +0100
     1.3 @@ -48,6 +48,9 @@ CONFIG_DIR = /etc
     1.4  else
     1.5  CONFIG_DIR = $(PREFIX)/etc
     1.6  endif
     1.7 +
     1.8 +SYSCONFIG_DIR = $(CONFIG_DIR)/sysconfig
     1.9 +
    1.10  XEN_CONFIG_DIR = $(CONFIG_DIR)/xen
    1.11  XEN_SCRIPT_DIR = $(XEN_CONFIG_DIR)/scripts
    1.12  
     2.1 --- a/tools/hotplug/Linux/Makefile	Fri Jul 23 17:39:32 2010 +0100
     2.2 +++ b/tools/hotplug/Linux/Makefile	Fri Jul 23 17:50:05 2010 +0100
     2.3 @@ -65,12 +65,12 @@ install: all install-initd install-scrip
     2.4  .PHONY: install-initd
     2.5  install-initd:
     2.6  	[ -d $(DESTDIR)$(CONFIG_DIR)/init.d ] || $(INSTALL_DIR) $(DESTDIR)$(CONFIG_DIR)/init.d
     2.7 -	[ -d $(DESTDIR)$(CONFIG_DIR)/sysconfig ] || $(INSTALL_DIR) $(DESTDIR)$(CONFIG_DIR)/sysconfig
     2.8 +	[ -d $(DESTDIR)$(SYSCONFIG_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(SYSCONFIG_DIR)
     2.9  	$(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)$(CONFIG_DIR)/init.d
    2.10  	$(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)$(CONFIG_DIR)/init.d
    2.11 -	$(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)$(CONFIG_DIR)/sysconfig/xendomains
    2.12 +	$(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)$(SYSCONFIG_DIR)/xendomains
    2.13  	$(INSTALL_PROG) $(XENCOMMONS_INITD) $(DESTDIR)$(CONFIG_DIR)/init.d
    2.14 -	$(INSTALL_PROG) $(XENCOMMONS_SYSCONFIG) $(DESTDIR)$(CONFIG_DIR)/sysconfig/xencommons
    2.15 +	$(INSTALL_PROG) $(XENCOMMONS_SYSCONFIG) $(DESTDIR)$(SYSCONFIG_DIR)/xencommons
    2.16  	$(INSTALL_PROG) init.d/xen-watchdog $(DESTDIR)$(CONFIG_DIR)/init.d
    2.17  
    2.18  .PHONY: install-scripts