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>

fix expansion of LXCPATH,LXCROOTFSMOUNT,LXCTEMPLATEDIR
5b12984b · Dwight Engen · Stéphane Graber · 0d2787be · 5b12984b · 5b12984b
Commit 5b12984b authored Sep 11, 2012 by Dwight Engen Committed by Stéphane Graber Nov 12, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

configure.ac configure.ac +1 -0

Makefile.am src/lxc/Makefile.am +0 -4

No files found.
--- 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

--- 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)