diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-07 03:34:46 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-07 03:34:46 -0400 |
| commit | 9ea83619baf30c4bd5cc27b51fd580925aa7db8b (patch) | |
| tree | 72cf4f38405786217871494c2e39e69d4f1dad01 /src/grp-machine | |
| parent | 826cd8f58443fc86d3ea61a4e49d29ee7abb8b1c (diff) | |
| parent | 37bb75d08b392517c50f6e97ff27484cfd255c08 (diff) | |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# src/Makefile
# src/grp-boot/Makefile
# src/grp-coredump/Makefile
# src/grp-machine/Makefile
# src/libsystemd/libsystemd-internal/subdir.mk
# src/libudev/Makefile
Diffstat (limited to 'src/grp-machine')
| -rw-r--r-- | src/grp-machine/machinectl/Makefile | 2 | ||||
| -rw-r--r-- | src/grp-machine/systemd-machined/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/grp-machine/machinectl/Makefile b/src/grp-machine/machinectl/Makefile index 924e2096de..556256eada 100644 --- a/src/grp-machine/machinectl/Makefile +++ b/src/grp-machine/machinectl/Makefile @@ -20,7 +20,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 $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk machinectl_SOURCES = \ diff --git a/src/grp-machine/systemd-machined/Makefile b/src/grp-machine/systemd-machined/Makefile index 7b6f89f907..59540c18c4 100644 --- a/src/grp-machine/systemd-machined/Makefile +++ b/src/grp-machine/systemd-machined/Makefile @@ -20,7 +20,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 $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk systemd_machined_SOURCES = \ |