From 0ff8efdbbf261377eefe6dc1d6da9defd523b2f4 Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <utx@penguin.cz>
Date: Thu, 16 Apr 2009 20:37:53 +0000
Subject: navit: Modules .so files must go to the main package, modules .la can
go away.
---
recipes/navit/navit.inc | 4 +++-
recipes/navit/navit_0.0.4.bb | 2 +-
recipes/navit/navit_0.1.0.bb | 2 +-
recipes/navit/navit_svn.bb | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
(limited to 'recipes/navit')
diff --git a/recipes/navit/navit.inc b/recipes/navit/navit.inc
index 8db05950e2..8ad439df2a 100644
--- a/recipes/navit/navit.inc
+++ b/recipes/navit/navit.inc
@@ -10,8 +10,8 @@ EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap -
PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
+FILES_${PN} += "${libdir}/${PN}/*/*.so"
FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug"
-FILES_${PN}-dev += "${libdir}/${PN}/*/*.so ${libdir}/${PN}/*/*.la"
SRC_URI_append = " \
file://navit.desktop \
@@ -27,4 +27,6 @@ do_install_append() {
mv ${D}${bindir}/navit ${D}${bindir}/navit.real
install -m 0755 ${WORKDIR}/navit.launcher ${D}${bindir}/navit
+
+ rm ${D}${libdir}/${PN}/*/*.la
}
diff --git a/recipes/navit/navit_0.0.4.bb b/recipes/navit/navit_0.0.4.bb
index f22d35e5a8..dbb83d9ff4 100644
--- a/recipes/navit/navit_0.0.4.bb
+++ b/recipes/navit/navit_0.0.4.bb
@@ -1,6 +1,6 @@
require navit.inc
-PR = "r1"
+PR = "r2"
SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz"
diff --git a/recipes/navit/navit_0.1.0.bb b/recipes/navit/navit_0.1.0.bb
index f1dfb1ceb4..5162fa0a85 100644
--- a/recipes/navit/navit_0.1.0.bb
+++ b/recipes/navit/navit_0.1.0.bb
@@ -1,5 +1,5 @@
require navit.inc
-PR = "r0"
+PR = "r1"
SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz"
diff --git a/recipes/navit/navit_svn.bb b/recipes/navit/navit_svn.bb
index df712a0eb2..833eb4714e 100644
--- a/recipes/navit/navit_svn.bb
+++ b/recipes/navit/navit_svn.bb
@@ -1,7 +1,7 @@
require navit.inc
PV = "0.1.0+svnrev${SRCREV}"
-PR = "r1"
+PR = "r2"
DEFAULT_PREFERENCE = "-1"
--
cgit v1.2.3