From 443f8e21b8217d80fa323d20ec163df5a3adcbc0 Mon Sep 17 00:00:00 2001 From: Thomas Zander Date: Tue, 6 Apr 2010 15:40:54 +0200 Subject: Fix 'make sis' working on symbian makefile based system again. Only use EPOCROOT as the source for libs on symbian-abld|symbian-sbsv2 --- src/s60installs/s60installs.pro | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index ffd15e6..dfce7d2 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -16,9 +16,15 @@ symbian: { BLD_INF_RULES.prj_exports += \ "sqlite3.sis $${EPOCROOT}epoc32/data/qt/sis/sqlite3.sis" \ "sqlite3_selfsigned.sis $${EPOCROOT}epoc32/data/qt/sis/sqlite3_selfsigned.sis" - sqlitedeployment = \ - "; Deploy sqlite onto phone that does not have it already" \ - "@\"$${EPOCROOT}epoc32/data/qt/sis/sqlite3.sis\", (0x2002af5f)" + symbian-abld|symbian-sbsv2 { + sqlitedeployment = \ + "; Deploy sqlite onto phone that does not have it already" \ + "@\"$${EPOCROOT}epoc32/data/qt/sis/sqlite3.sis\", (0x2002af5f)" + } else { + sqlitedeployment = \ + "; Deploy sqlite onto phone that does not have it already" \ + "@\"$${PWD}/sqlite3.sis\", (0x2002af5f)" + } qtlibraries.pkg_postrules += sqlitedeployment } else { # Always use experimental UID for infixed configuration to avoid UID clash -- cgit v0.12