Skip to content

L
lxc
Commit 3fb0a9bb by Andrian Nord Committed by Daniel Lezcano
Options

Q: general lxc architecture

Patch moves etc/* contents into doc/examples/ and adds --disable-examples configure switch which may be used not to install examples. Default is to install them into ${docdir}/examples (commonly: /usr/share/doc/lxc/examples) Signed-off-by: 's avatarAndrian Nord <NightNord@gmail.com> Signed-off-by: 's avatarDaniel Lezcano <dlezcano@fr.ibm.com>
parent 0079c6c0
Showing with 26 additions and 21 deletions
Makefile.am
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
ACLOCAL_AMFLAGS = -I config ACLOCAL_AMFLAGS = -I config
SUBDIRS = src etc scripts doc SUBDIRS = src scripts doc
DIST_SUBDIRS = config src etc scripts doc DIST_SUBDIRS = config src scripts doc
EXTRA_DIST = autogen.sh lxc.spec CONTRIBUTING MAINTAINERS ChangeLog EXTRA_DIST = autogen.sh lxc.spec CONTRIBUTING MAINTAINERS ChangeLog
pcdatadir = $(datadir)/pkgconfig pcdatadir = $(datadir)/pkgconfig
......
configure.ac
...@@ -25,6 +25,12 @@ fi ...@@ -25,6 +25,12 @@ fi
AM_CONDITIONAL([ENABLE_DOCBOOK], [test "x$have_docbook" = "xyes"]) AM_CONDITIONAL([ENABLE_DOCBOOK], [test "x$have_docbook" = "xyes"])
AC_ARG_ENABLE([examples],
[AC_HELP_STRING([--disable-examples], [do not install configuration examples])],
[], [enable_examples=yes])
AM_CONDITIONAL([ENABLE_EXAMPLES], [test "x$enable_examples" = "xyes"])
AS_AC_EXPAND(PREFIX, $prefix) AS_AC_EXPAND(PREFIX, $prefix)
AS_AC_EXPAND(LIBDIR, $libdir) AS_AC_EXPAND(LIBDIR, $libdir)
AS_AC_EXPAND(BINDIR, $bindir) AS_AC_EXPAND(BINDIR, $bindir)
...@@ -103,13 +109,13 @@ AC_CONFIG_FILES([ ...@@ -103,13 +109,13 @@ AC_CONFIG_FILES([
src/lxc/lxc-create src/lxc/lxc-create
src/lxc/lxc-destroy src/lxc/lxc-destroy
etc/Makefile doc/examples/Makefile
etc/lxc-macvlan.conf doc/examples/lxc-macvlan.conf
etc/lxc-no-netns.conf doc/examples/lxc-no-netns.conf
etc/lxc-empty-netns.conf doc/examples/lxc-empty-netns.conf
etc/lxc-phys.conf doc/examples/lxc-phys.conf
etc/lxc-veth.conf doc/examples/lxc-veth.conf
etc/lxc-complex-config doc/examples/lxc-complex-config
]) ])
AC_CONFIG_COMMANDS([default],[[]],[[]]) AC_CONFIG_COMMANDS([default],[[]],[[]])
AC_OUTPUT AC_OUTPUT
......
doc/Makefile.am
SUBDIRS = examples
DIST_SUBDIRS = examples
EXTRA_DIST = \ EXTRA_DIST = \
FAQ.txt \ FAQ.txt \
......
etc/Makefile.am → doc/examples/Makefile.am
pkgsysconfdir = $(sysconfdir)/$(PACKAGE) EXTRA_DIST = $(pkgexamples_DATA)
pkgsysconf_DATA = \
if ENABLE_EXAMPLES
pkgexamplesdir=$(docdir)/examples
pkgexamples_DATA = \
lxc-macvlan.conf \ lxc-macvlan.conf \
lxc-no-netns.conf \ lxc-no-netns.conf \
lxc-empty-netns.conf \ lxc-empty-netns.conf \
lxc-phys.conf \ lxc-phys.conf \
lxc-veth.conf \ lxc-veth.conf \
lxc-complex-config lxc-complex-config
endif
noinst_DATA = \ noinst_DATA = \
lxc-macvlan.conf.in \ lxc-macvlan.conf.in \
lxc-empty-netns.conf.in \ lxc-empty-netns.conf.in \
......
etc/lxc-complex-config.in → doc/examples/lxc-complex-config.in
# Container with network a complex network mixing macvlan, veth and # Container with network a complex network mixing macvlan, veth and
# physical network devices # physical network devices
lxc.utsname = complex lxc.utsname = complex
lxc.network.type = veth lxc.network.type = veth
......
etc/.cvsignore deleted 100644 → 0
Makefile
Makefile.in
lxc-complex-config
lxc-empty-netns.conf
lxc-macvlan.conf
lxc-no-netns.conf
lxc-phys.conf
lxc-veth.conf
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment