From 5b12984bf9d1d952a402932d3d87aaef2d1ca6f2 Mon Sep 17 00:00:00 2001 From: Dwight Engen Date: Tue, 11 Sep 2012 17:06:05 -0400 Subject: [PATCH] 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 --- configure.ac | 1 + src/lxc/Makefile.am | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 6f819d27a..6dbb7c22f 100644 --- 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 11c025728..7d86ad661 100644 --- 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) -- 2.39.5