diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-01 17:23:29 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-01 17:23:29 -0400 |
| commit | 5abbec416484b36048b9011d0ba0eb7888715765 (patch) | |
| tree | 7e49cbc49818ccf9b0f4449185efedfff355ebc8 /src/systemd-nspawn | |
| parent | bcf1acd2a33706c296339f5627eb4070fdda2ecd (diff) | |
| parent | 3c809f112da0458a7d80c903543b430e08279385 (diff) | |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# build-aux/Makefile.once.head/20-systemd.mk
# build-aux/Makefile.once.tail/20-systemd.mk
# config.mk.in
# src/libbasic/Makefile
# src/libshared/Makefile
# src/libsystemd/libsystemd-internal/Makefile
Diffstat (limited to 'src/systemd-nspawn')
| -rw-r--r-- | src/systemd-nspawn/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile index 3455305df8..a8cd4f5d7e 100644 --- a/src/systemd-nspawn/Makefile +++ b/src/systemd-nspawn/Makefile @@ -78,4 +78,5 @@ endif $(outdir)/nspawn.o: $(outdir)/loopback-setup.h +$(eval $(value automake2autothing)) include $(topsrcdir)/build-aux/Makefile.tail.mk |