diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-07 00:06:45 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-07 00:06:45 -0400 |
| commit | a3e390abebfaeb7c2c8f57dcf721075e85801a4c (patch) | |
| tree | 52384648eb1383dc1bdf2916147f260cbccba71e /src/grp-boot/bootctl | |
| parent | aab3aab0b571d8ebb3316808f7da91fda86fa180 (diff) | |
| parent | 7a901e86b9e5ae219ee5db89453864ff4ea19afd (diff) | |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# src/systemd-nspawn/Makefile
Diffstat (limited to 'src/grp-boot/bootctl')
| -rw-r--r-- | src/grp-boot/bootctl/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/grp-boot/bootctl/Makefile b/src/grp-boot/bootctl/Makefile index d01e6ea7d3..2fcdc44799 100644 --- a/src/grp-boot/bootctl/Makefile +++ b/src/grp-boot/bootctl/Makefile @@ -49,7 +49,7 @@ dist_bashcompletion_data += \ dist_zshcompletion_data += \ shell-completion/zsh/_bootctl -endif - +endif # HAVE_BLKID +endif # ENABLE_EFI $(eval $(value automake2autothing)) include $(topsrcdir)/build-aux/Makefile.tail.mk |