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: Andrian Nord <NightNord@gmail.com> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

Q: general lxc architecture
3fb0a9bb · Andrian Nord · Daniel Lezcano · 0079c6c0 · 3fb0a9bb · 3fb0a9bb
Commit 3fb0a9bb authored Nov 13, 2009 by Andrian Nord Committed by Daniel Lezcano Nov 13, 2009
11 changed files
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,8 +2,8 @@

 ACLOCAL_AMFLAGS = -I config

-SUBDIRS = src etc scripts doc
-DIST_SUBDIRS = config src etc scripts doc
+SUBDIRS = src scripts doc
+DIST_SUBDIRS = config src scripts doc
 EXTRA_DIST = autogen.sh lxc.spec CONTRIBUTING MAINTAINERS ChangeLog

 pcdatadir = $(datadir)/pkgconfig

--- a/configure.ac
+++ b/configure.ac
@@ -25,6 +25,12 @@ fi

 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(LIBDIR, $libdir)
 AS_AC_EXPAND(BINDIR, $bindir)
@@ -103,13 +109,13 @@ AC_CONFIG_FILES([
 	src/lxc/lxc-create
 	src/lxc/lxc-destroy

-	etc/Makefile
-	etc/lxc-macvlan.conf
-	etc/lxc-no-netns.conf
-	etc/lxc-empty-netns.conf
-	etc/lxc-phys.conf
-	etc/lxc-veth.conf
-	etc/lxc-complex-config
+	doc/examples/Makefile
+	doc/examples/lxc-macvlan.conf
+	doc/examples/lxc-no-netns.conf
+	doc/examples/lxc-empty-netns.conf
+	doc/examples/lxc-phys.conf
+	doc/examples/lxc-veth.conf
+	doc/examples/lxc-complex-config
 ])
 AC_CONFIG_COMMANDS([default],[[]],[[]])
 AC_OUTPUT

--- a/doc/Makefile.am
+++ b/doc/Makefile.am
+SUBDIRS = examples
+DIST_SUBDIRS = examples

 EXTRA_DIST = \
 	FAQ.txt \

--- a/etc/Makefile.am
+++ b/etc/Makefile.am
-pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
-pkgsysconf_DATA = \
+EXTRA_DIST = $(pkgexamples_DATA)
+
+if ENABLE_EXAMPLES
+pkgexamplesdir=$(docdir)/examples
+
+pkgexamples_DATA = \
 	lxc-macvlan.conf \
 	lxc-no-netns.conf \
 	lxc-empty-netns.conf \
 	lxc-phys.conf \
 	lxc-veth.conf \
 	lxc-complex-config
+endif
+
 noinst_DATA = \
 	lxc-macvlan.conf.in \
 	lxc-empty-netns.conf.in \

--- a/etc/lxc-complex-config.in
+++ b/etc/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
 lxc.utsname = complex
 lxc.network.type = veth

--- a/etc/lxc-empty-netns.conf.in
+++ b/etc/lxc-empty-netns.conf.in
--- a/etc/lxc-macvlan.conf.in
+++ b/etc/lxc-macvlan.conf.in
--- a/etc/lxc-no-netns.conf.in
+++ b/etc/lxc-no-netns.conf.in
--- a/etc/lxc-phys.conf.in
+++ b/etc/lxc-phys.conf.in
--- a/etc/lxc-veth.conf.in
+++ b/etc/lxc-veth.conf.in
--- a/etc/.cvsignore
+++ b/etc/.cvsignore
-Makefile
-Makefile.in
-lxc-complex-config
-lxc-empty-netns.conf
-lxc-macvlan.conf
-lxc-no-netns.conf
-lxc-phys.conf
-lxc-veth.conf
-