diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-01 14:50:48 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-01 14:50:48 -0400 |
| commit | 8ab6d6ae4a1fbefe7c772a8513e5d5a38f49a302 (patch) | |
| tree | 20000a90a738370fff9e44c5e8fbaccea08e949c /src/systemd-nspawn | |
| parent | 7308e9ffd1933c71e6134e1b9632683977a12f47 (diff) | |
| parent | db51244983a38d901fefd5e2a090f0e66343d98d (diff) | |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# am-pretty.mk
# config.mk.in
# src/journal/Makefile
# src/kernel-install/Makefile
# src/libbasic/Makefile
# src/libfirewall/Makefile
# src/libshared/Makefile
# src/libsystemd/Makefile
# src/libsystemd/libsystemd-internal/Makefile
# src/libsystemd/libsystemd-journal-internal/Makefile
# src/libsystemd/src/Makefile
# src/systemd-nspawn/Makefile
# src/systemd-nspawn/nspawn-network.c
# src/udev/udev.h
Diffstat (limited to 'src/systemd-nspawn')
| -rw-r--r-- | src/systemd-nspawn/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile index 0bcc238b72..12b002c868 100644 --- a/src/systemd-nspawn/Makefile +++ b/src/systemd-nspawn/Makefile @@ -21,7 +21,7 @@ # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see <http://www.gnu.org/licenses/>. include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk -include $(topsrcdir)/automake.head.mk +include $(topsrcdir)/build-aux/Makefile.head.mk systemd_nspawn_SOURCES = \ src/nspawn/nspawn.c \ @@ -83,4 +83,4 @@ $(outdir)/loopback-setup.h: $(topsrcdir)/src/libcore/loopback-setup.h; $(CP) $< $(outdir)/nspawn.o: $(outdir)/loopback-setup.h -include $(topsrcdir)/automake.tail.mk +include $(topsrcdir)/build-aux/Makefile.tail.mk |