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

[David Herrmann]

 Makefile.am  |    8 ++++----
 configure.ac |    6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit c4a77bcb9a50f152557e25c90837d8bfef858729
Author: Marc-Antoine Perennou <Marc-Antoine at Perennou.com>
Date:   Wed Apr 8 22:33:54 2015 +0200

    build: allow setting OBJCOPY

diff --git a/Makefile.am b/Makefile.am
index 453b524..72a2c3c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2632,7 +2632,7 @@ $(systemd_boot_solib): $(systemd_boot_objects)
 	nm -D -u $@ | grep ' U ' && exit 1 || :
 
 $(systemd_boot): $(systemd_boot_solib)
-	$(AM_V_GEN) objcopy -j .text -j .sdata -j .data -j .dynamic \
+	$(AM_V_GEN)$(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \
 	  -j .dynsym -j .rel -j .rela -j .reloc $(EFI_FORMAT) $< $@
 
 # ------------------------------------------------------------------------------
@@ -2669,7 +2669,7 @@ $(stub_solib): $(stub_objects)
 	nm -D -u $@ | grep ' U ' && exit 1 || :
 
 $(stub): $(stub_solib)
-	$(AM_V_GEN) objcopy -j .text -j .sdata -j .data -j .dynamic \
+	$(AM_V_GEN)$(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \
 	  -j .dynsym -j .rel -j .rela -j .reloc $(EFI_FORMAT) $< $@
 
 # ------------------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 28cec8f..4ff7095 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,6 +120,7 @@ GOBJECT_INTROSPECTION_CHECK([1.31.1])
    AM_CONDITIONAL([HAVE_INTROSPECTION], [false])
    enable_introspection=no])
 
+AC_CHECK_TOOL(OBJCOPY, objcopy)
 AC_CHECK_TOOL(STRINGS, strings)
 AC_CHECK_TOOL(GPERF, gperf)
 if test -z "$GPERF" ; then

commit 63e69fb4a0ce15d5a0c35c384402834ec2cb5152
Author: Marc-Antoine Perennou <Marc-Antoine at Perennou.com>
Date:   Wed Apr 8 22:33:53 2015 +0200

    configure: allow setting EFI_CC

diff --git a/configure.ac b/configure.ac
index 79f6ddf..28cec8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1149,8 +1149,7 @@ fi
 AM_CONDITIONAL(ENABLE_EFI, [test "x$have_efi" = "xyes"])
 
 # ------------------------------------------------------------------------------
-EFI_CC=gcc
-AC_SUBST([EFI_CC])
+AC_CHECK_TOOL(EFI_CC, gcc)
 
 EFI_ARCH=`echo $host | sed "s/\(-\).*$//"`
 

commit 531ddb915b8208ae93cfb01f9a8a268efa3bea56
Author: Marc-Antoine Perennou <Marc-Antoine at Perennou.com>
Date:   Tue Apr 7 20:54:04 2015 +0200

    efi: use EFI_CC

diff --git a/configure.ac b/configure.ac
index 6713e03..79f6ddf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1177,7 +1177,7 @@ AS_IF([test "x$enable_gnuefi" != "xno"], [
                        [AC_MSG_ERROR([*** gnuefi support requested but headers not found])])
         ])
 
-        efiroot=$(echo $(cd /usr/lib/$(gcc -print-multi-os-directory); pwd))
+        efiroot=$(echo $(cd /usr/lib/$(${EFI_CC} -print-multi-os-directory); pwd))
 
         EFI_LIB_DIR="$efiroot"
         AC_ARG_WITH(efi-libdir,

commit 0a5d1ed9b51241595c11b89873f1b95dede6b103
Author: Marc-Antoine Perennou <Marc-Antoine at Perennou.com>
Date:   Tue Apr 7 20:54:02 2015 +0200

    factory: install to datadir

diff --git a/Makefile.am b/Makefile.am
index 815e366..453b524 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -109,8 +109,8 @@ udevrulesdir=$(udevlibexecdir)/rules.d
 udevhwdbdir=$(udevlibexecdir)/hwdb.d
 catalogdir=$(prefix)/lib/systemd/catalog
 kernelinstalldir = $(prefix)/lib/kernel/install.d
-factory_etcdir = $(prefix)/share/factory/etc
-factory_pamdir = $(prefix)/share/factory/etc/pam.d
+factory_etcdir = $(datadir)/factory/etc
+factory_pamdir = $(datadir)/factory/etc/pam.d
 bootlibdir = $(prefix)/lib/systemd/boot/efi
 
 # And these are the special ones for /