From: Serge Hallyn Date: Fri, 31 May 2013 14:02:33 +0000 (+0200) Subject: configure/makefile: rename default_conf to distro_conf X-Git-Tag: lxc-1.0.0.alpha1~1^2~173 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a647d582dc759e43c2087f0d906adf77c62ab6c;p=thirdparty%2Flxc.git configure/makefile: rename default_conf to distro_conf configure/makefile: rename default_conf to distro_conf, since it is a per-distro default. Then we'll be able to use the symbol LXC_DEFAULT_CONF in the code to refer to the installed file. Signed-off-by: Serge Hallyn Acked-by: Stéphane Graber --- diff --git a/config/Makefile.am b/config/Makefile.am index 47f27505e..81d770921 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -1,11 +1,11 @@ configdir = $(sysconfdir)/lxc config_DATA = default.conf -defaultconf = @LXC_DEFAULT_CONF@ +distroconf = @LXC_DISTRO_CONF@ EXTRA_DIST = default.conf.ubuntu default.conf.libvirt default.conf.unknown default.conf: - cp $(defaultconf) $@ + cp $(distroconf) $@ clean-local: @$(RM) -f default.conf diff --git a/configure.ac b/configure.ac index d802406cf..65751ce3c 100644 --- a/configure.ac +++ b/configure.ac @@ -39,14 +39,14 @@ if test "z$with_distro" = "z"; then fi case $with_distro in ubuntu) - defaultconf=default.conf.ubuntu + distroconf=default.conf.ubuntu ;; redhat|fedora|oracle|oracleserver) - defaultconf=default.conf.libvirt + distroconf=default.conf.libvirt ;; *) echo -n "Linux distribution network config unknown, defaulting to lxc.network.type = empty" - defaultconf=default.conf.unknown + distroconf=default.conf.unknown ;; esac AC_MSG_RESULT([$with_distro]) @@ -221,7 +221,7 @@ AS_AC_EXPAND(SYSCONFDIR, "$sysconfdir") AS_AC_EXPAND(DATADIR, "$datadir") AS_AC_EXPAND(LOCALSTATEDIR, "$localstatedir") AS_AC_EXPAND(DOCDIR, "$docdir") -AS_AC_EXPAND(LXC_DEFAULT_CONF, "$defaultconf") +AS_AC_EXPAND(LXC_DISTRO_CONF, "$distroconf") AS_AC_EXPAND(LXC_GENERATE_DATE, "$(date)") AS_AC_EXPAND(LXCPATH, "$with_config_path") AS_AC_EXPAND(LXC_GLOBAL_CONF, "$with_global_conf")