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 <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>

diff --git a/config/Makefile.am b/config/Makefile.am
index 47f27505e49bb27845663f2d26ce1cbc99675650..81d770921a4c1af823a6f859ef67e9636ca5cdb4 100644 (file)
--- 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 d802406cf715e568d111a0fc92323bf1f0e2a83e..65751ce3c6af5b173a7f5f140a7598a39ba44e5d 100644 (file)
--- 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")