fix expansion of LXCPATH,LXCROOTFSMOUNT,LXCTEMPLATEDIR

These variables are not expanded correctly in doc/lxc-create.sgml.in
and a workaround is in place to ensure ${localstatedir}, and ${datadir}
are set in the various shell scripts that use it. There is no workaround
to ensure ${datadir} is set in src/lxc/lxc-create.in, nor is
${localstatedir} set in templates/lxc-altlinux.in so I think that these
are currently broken.

Using AS_AC_EXPAND instead of AC_SUBST fixes these problems and removes
the need for the workarounds. In addition the lxc-start-ephemeral.in
script can be autoconf'ed instead of sed'ed by the makefile.

Signed-off-by: Dwight Engen <dwight.engen@oracle.com>

diff --git a/configure.ac b/configure.ac
index 6f819d27acc43330b94be66200ee2969cb4c9bb8..6dbb7c22f6c0fde235c36b70f9ec4a3d78f66f5e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -213,6 +213,7 @@ AC_CONFIG_FILES([
        src/lxc/lxc-create
        src/lxc/lxc-clone
        src/lxc/lxc-shutdown
+       src/lxc/lxc-start-ephemeral
        src/lxc/lxc-destroy
 
        src/python-lxc/Makefile

diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index 11c025728ac2266c9daa837f145d0f9d93ced13b..7d86ad66128e12d81c219e41e3052c3911c88f5e 100644 (file)
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -144,10 +144,6 @@ lxc_unshare_SOURCES = lxc_unshare.c
 lxc_wait_SOURCES = lxc_wait.c
 lxc_kill_SOURCES = lxc_kill.c
 
-lxc-start-ephemeral: lxc-start-ephemeral.in
-       [ -f $@ ] && rm -f $@ || true
-       $(SED) -e "s:[@]LXCPATH@:$(LXCPATH):" $< > $@
-
 install-exec-local: install-soPROGRAMS
        mv $(DESTDIR)$(libdir)/liblxc.so $(DESTDIR)$(libdir)/liblxc.so.$(VERSION)
        /sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION)