Fix installation of out-of-tree (VPATH) builds

Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>

diff --git a/config/apparmor/Makefile.am b/config/apparmor/Makefile.am
index f02ac937ffc34fb13f1b3bf25eda5dd7e55489b7..e7259f73c1ab4887e8505b0d5f7c9af62ca03aeb 100644 (file)
--- a/config/apparmor/Makefile.am
+++ b/config/apparmor/Makefile.am
@@ -17,13 +17,13 @@ install-apparmor:
        $(MKDIR_P) $(DESTDIR)$(sysconfdir)/apparmor.d/
        $(MKDIR_P) $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/lxc/
        $(MKDIR_P) $(DESTDIR)$(sysconfdir)/apparmor.d/lxc/
-       $(INSTALL_DATA) abstractions/container-base $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/lxc/
-       $(INSTALL_DATA) abstractions/start-container $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/lxc/
-       $(INSTALL_DATA) profiles/lxc-default $(DESTDIR)$(sysconfdir)/apparmor.d/lxc/
-       $(INSTALL_DATA) profiles/lxc-default-with-mounting $(DESTDIR)$(sysconfdir)/apparmor.d/lxc/
-       $(INSTALL_DATA) profiles/lxc-default-with-nesting $(DESTDIR)$(sysconfdir)/apparmor.d/lxc/
-       $(INSTALL_DATA) lxc-containers $(DESTDIR)$(sysconfdir)/apparmor.d/
-       $(INSTALL_DATA) usr.bin.lxc-start $(DESTDIR)$(sysconfdir)/apparmor.d/
+       $(INSTALL_DATA) $(srcdir)/abstractions/container-base $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/lxc/
+       $(INSTALL_DATA) $(srcdir)/abstractions/start-container $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/lxc/
+       $(INSTALL_DATA) $(srcdir)/profiles/lxc-default $(DESTDIR)$(sysconfdir)/apparmor.d/lxc/
+       $(INSTALL_DATA) $(srcdir)/profiles/lxc-default-with-mounting $(DESTDIR)$(sysconfdir)/apparmor.d/lxc/
+       $(INSTALL_DATA) $(srcdir)/profiles/lxc-default-with-nesting $(DESTDIR)$(sysconfdir)/apparmor.d/lxc/
+       $(INSTALL_DATA) $(srcdir)/lxc-containers $(DESTDIR)$(sysconfdir)/apparmor.d/
+       $(INSTALL_DATA) $(srcdir)/usr.bin.lxc-start $(DESTDIR)$(sysconfdir)/apparmor.d/
 
 uninstall-apparmor:
        rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/usr.bin.lxc-start

diff --git a/config/init/upstart/Makefile.am b/config/init/upstart/Makefile.am
index 32b90b918cb98436d5df4f326823fe97eb2424e5..df923a8b714fe1446f0791b5ea27e5347b517ff0 100644 (file)
--- a/config/init/upstart/Makefile.am
+++ b/config/init/upstart/Makefile.am
@@ -4,7 +4,7 @@ if INIT_SCRIPT_UPSTART
 install-upstart: lxc.conf lxc-instance.conf lxc-net.conf
        $(MKDIR_P) $(DESTDIR)$(sysconfdir)/init/
        $(INSTALL_DATA) lxc.conf $(DESTDIR)$(sysconfdir)/init/
-       $(INSTALL_DATA) lxc-instance.conf $(DESTDIR)$(sysconfdir)/init/
+       $(INSTALL_DATA) $(srcdir)/lxc-instance.conf $(DESTDIR)$(sysconfdir)/init/
        $(INSTALL_DATA) lxc-net.conf $(DESTDIR)$(sysconfdir)/init/
 
 uninstall-upstart: