[systemd-commits] 2 commits - configure.ac Makefile.am

[Kay Sievers]

 Makefile.am  |    1 +
 configure.ac |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 297f24a902110921a0627b40372ed2332229b706
Author: Kay Sievers <kay at vrfy.org>
Date:   Tue Apr 21 19:47:00 2015 +0200

    build-sys: efi - use $EFI_LIB_DIR
    
    https://bugs.freedesktop.org/show_bug.cgi?id=89982

diff --git a/configure.ac b/configure.ac
index 4ff7095..fbb437e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1191,7 +1191,7 @@ AS_IF([test "x$enable_gnuefi" != "xno"], [
                 AS_HELP_STRING([--with-efi-ldsdir=PATH], [Path to EFI lds directory]),
                 [EFI_LDS_DIR="$withval" && AC_CHECK_FILE([${EFI_LDS_DIR}/elf_${EFI_ARCH}_efi.lds],
                         [have_efi_lds=yes])],
-                [AS_FOR([DIR], [EFI_LDS_DIR], ["${efiroot}/gnuefi" "${efiroot}"],
+                [AS_FOR([DIR], [EFI_LDS_DIR], ["${EFI_LIB_DIR}/gnuefi" "${EFI_LIB_DIR}"],
                         [AC_CHECK_FILE([${EFI_LDS_DIR}/elf_${EFI_ARCH}_efi.lds],
                                        [have_efi_lds=yes && break])])])
         AS_IF([test "x$have_efi_lds" = xyes],

commit 73e21667cb1de345ec8560f8f567f83ab467315d
Author: Kay Sievers <kay at vrfy.org>
Date:   Tue Apr 21 19:44:27 2015 +0200

    build-sys: add missing file

diff --git a/Makefile.am b/Makefile.am
index a04db25..6a03bc4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -776,6 +776,7 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/architecture.h \
 	src/shared/efivars.c \
 	src/shared/efivars.h \
+	src/shared/formats-util.h \
 	src/shared/fstab-util.c \
 	src/shared/fstab-util.h \
 	src/shared/path-util.c \