Use configure --sysconfdir=DIR to set CONFIG_DIR

Preserve existing behaviour: if the option was not given, set existing
defaults for FreeBSD, Solaris and everything else.

Signed-off-by: Olaf Hering <olaf@aepfle.de>

config/FreeBSD.mk

@@ -4,5 +4,3 @@ DLOPEN_LIBS =
 
 # No wget on FreeBSD base system
 WGET = ftp
-
-CONFIG_DIR = $(PREFIX)/etc

config/StdGNU.mk

@@ -41,7 +41,6 @@ XENFIRMWAREDIR = $(PREFIX)/lib/xen/boot
 PRIVATE_PREFIX = $(LIBDIR)/xen
 PRIVATE_BINDIR = $(PRIVATE_PREFIX)/bin
 
-CONFIG_DIR = /etc
 XEN_LOCK_DIR = /var/lock
 XEN_RUN_DIR = /var/run/xen
 XEN_PAGING_DIR = /var/lib/xen/xenpaging

config/SunOS.mk

@@ -31,11 +31,6 @@ XENFIRMWAREDIR = $(LIBDIR)/xen/boot
 PRIVATE_PREFIX = $(LIBDIR)/xen
 PRIVATE_BINDIR = $(PRIVATE_PREFIX)/bin
 
-ifeq ($(PREFIX),/usr)
-CONFIG_DIR = /etc
-else
-CONFIG_DIR = $(PREFIX)/etc
-endif
 XEN_CONFIG_DIR = $(CONFIG_DIR)/xen
 XEN_SCRIPT_DIR = $(PRIVATE_PREFIX)/scripts
 

m4/paths.m4

@@ -3,6 +3,25 @@ dnl expand these early so we can use this for substitutions
 test "x$prefix" = "xNONE" && prefix=$ac_default_prefix
 test "x$exec_prefix" = "xNONE" && exec_prefix=${prefix}
 
+dnl
+if test "x$sysconfdir" = 'x${prefix}/etc' ; then
+    case "$host_os" in
+         *freebsd*)
+         sysconfdir=$prefix/etc
+         ;;
+         *solaris*)
+         if test "$prefix" = "/usr" ; then
+             sysconfdir=/etc
+         else
+             sysconfdir=$prefix/etc
+         fi
+         ;;
+         *)
+         sysconfdir=/etc
+         ;;
+    esac
+fi
+
 BINDIR=$prefix/bin
 AC_SUBST(BINDIR)
 
@@ -41,7 +60,7 @@ AC_SUBST(PRIVATE_BINDIR)
 XENFIRMWAREDIR=$prefix/lib/xen/boot
 AC_SUBST(XENFIRMWAREDIR)
 
-CONFIG_DIR=/etc
+CONFIG_DIR=$sysconfdir
 AC_SUBST(CONFIG_DIR)
 
 XEN_CONFIG_DIR=$CONFIG_DIR/xen