From 31cf50c93702b5fb59b788c39f62196b18bcd2f3 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay@vrfy.org>
Date: Sat, 9 Mar 2013 20:19:56 +0100
Subject: [PATCH] build-sys: only use $prefix

---
 Makefile.am  | 7 ++++++-
 autogen.sh   | 8 +-------
 configure.ac | 2 --
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 1e21c40..3cdaf7d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 AM_MAKEFLAGS = --no-print-directory
 
-gummibootlibdir = $(libexecdir)/gummiboot
+gummibootlibdir = $(prefix)/lib/gummiboot
 
 AM_CPPFLAGS = -include config.h
 AM_CFLAGS = -Wall -Wextra
@@ -136,3 +136,8 @@ test-disk: gummiboot$(MACHINE_TYPE_NAME).efi test/test-create-disk.sh
 
 qemu: test-disk
 	$(QEMU_KVM) -m 256 -L $(BIOS) -snapshot test-disk
+
+install-tree: all
+	rm -rf $(abs_srcdir)/install-tree
+	$(MAKE) install DESTDIR=$(abs_srcdir)/install-tree
+	tree $(abs_srcdir)/install-tree
diff --git a/autogen.sh b/autogen.sh
index 0c67475..dfe9eba 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,14 +19,8 @@ set -e
 
 autoreconf --force --install --symlink
 
-libdir() {
-        echo $(cd "$1/$(gcc -print-multi-os-directory)"; pwd)
-}
-
 args="\
---sysconfdir=/etc \
---libexecdir=/usr/lib \
---libdir=$(libdir /usr/lib)"
+--prefix=/usr"
 
 if [ "x$1" = "xc" ]; then
         ./configure $args
diff --git a/configure.ac b/configure.ac
index 257b48a..f5bd0a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -112,8 +112,6 @@ AC_MSG_RESULT([
         machine type:            $MACHINE_TYPE_NAME
 
         prefix:                  ${prefix}
-        libexecdir:              ${libexecdir}
-        libdir:                  ${libdir}
 
         blkid:                   ${have_blkid}
         efi libs:                ${GNUEFI_LIBS}
-- 
2.7.4