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.hal...@ubuntu.com>
---
config/Makefile.am | 4 ++--
configure.ac | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/config/Makefile.am b/config/Makefile.am
index 47f2750..81d7709 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 d802406..65751ce 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")
--
1.8.1.2
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite
It's a free troubleshooting tool designed for production
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap2
_______________________________________________
Lxc-devel mailing list
Lxc-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/lxc-devel
