From a9dc0c13dfe2935d10af62888fed65e746ccbb3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sat, 9 Feb 2019 19:19:34 +0100
Subject: [PATCH] vice: fix install - broken by last commit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../vice/files/0003-Set-fixed-VICEDIR.patch   | 30 +++++++++++++++++++
 recipes-emulators/vice/vice_3.2.bb            |  6 ++--
 2 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 recipes-emulators/vice/files/0003-Set-fixed-VICEDIR.patch

diff --git a/recipes-emulators/vice/files/0003-Set-fixed-VICEDIR.patch b/recipes-emulators/vice/files/0003-Set-fixed-VICEDIR.patch
new file mode 100644
index 0000000..0b44a55
--- /dev/null
+++ b/recipes-emulators/vice/files/0003-Set-fixed-VICEDIR.patch
@@ -0,0 +1,30 @@
+From f4fa367ab6e79cbfd77254237335f383311006ec Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sat, 9 Feb 2019 22:16:52 +0100
+Subject: [PATCH] Set fixed VICEDIR
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index c5139fd..402e893 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -5010,6 +5010,7 @@ case "$host_os" in
+     AM_CONDITIONAL(ALTERNATE_DOCDIR, false)
+     ;;  
+ esac
++VICEDIR="$libdir/vice"
+ AC_SUBST(VICEDIR)
+ AC_DEFINE_UNQUOTED(VICEDIR, "$VICEDIR",
+ 		   [Where should we lookup for data files?])
+-- 
+2.20.1
+
diff --git a/recipes-emulators/vice/vice_3.2.bb b/recipes-emulators/vice/vice_3.2.bb
index 1d0cfc4..9902efe 100644
--- a/recipes-emulators/vice/vice_3.2.bb
+++ b/recipes-emulators/vice/vice_3.2.bb
@@ -10,6 +10,7 @@ SRC_URI = " \
     ${SOURCEFORGE_MIRROR}/vice-emu/${BPN}-${PV}.tar.gz \
     file://0001-fix-autoreconfig.patch \
     file://0002-Hack-build-with-latest-FFMPEG.patch \
+    file://0003-Set-fixed-VICEDIR.patch \
     file://c64_16.png \
     file://c64_32.png \
     file://c64_48.png \
@@ -50,11 +51,10 @@ EXTRA_OECONF = " \
     --enable-gnomeui \
     --with-uithreads \
     --without-oss \
+    --libdir=${libdir} \
 "
 
-do_install() {
-    oe_runmake DESTDIR=${D} VICEDIR=${libdir}
-
+do_install_append() {
     install -d ${D}/${datadir}/applications
     install -m 0644 ${WORKDIR}/vice_64.desktop ${D}/${datadir}/applications