--- a/.hgignore	Fri May 21 15:45:10 2010 +0100
+++ b/.hgignore	Fri May 21 16:43:17 2010 +0100
@@ -3,3 +3,4 @@
 ^.*\.o$
 ^.*moc_.*$
 ^.*Makefile.*$
+^bin/.*$
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/smf/desktop.pri	Fri May 21 16:43:17 2010 +0100
@@ -0,0 +1,8 @@
+# Set up destination and link variables 
+
+!symbian {
+    DESTDIR = $$PWD/../bin
+
+    INCLUDEPATH += $$PWD/smfservermodule/util/qjson/src
+    LIBS += -L$$PWD/../bin -Wl,-rpath,$$PWD/../bin
+}

--- a/smf/smfservermodule/smfclient/smfclient.pro	Fri May 21 15:45:10 2010 +0100
+++ b/smf/smfservermodule/smfclient/smfclient.pro	Fri May 21 16:43:17 2010 +0100
@@ -13,6 +13,11 @@
 include(client/client.pri)
 include(common/common.pri)
 
+!symbian {
+    include(../../desktop.pri)
+    LIBS += -lqjson
+}
+
 # Private Headers
 HEADERS += $$PUBLIC_HEADERS \
     $$PRIVATE_HEADERS
@@ -28,8 +33,5 @@
     TARGET.EPOCALLOWDLLDATA = 1
     SOURCES += smfclient_reg.rss
     LIBS += -lqjson.dll
-} else {
-    INCLUDEPATH += ../util/qjson/src
-    LIBS += -L../util/qjson/lib -lqjson
-}
+} 
 

--- a/smf/smfservermodule/smfserver/smfserver.pro	Fri May 21 15:45:10 2010 +0100
+++ b/smf/smfservermodule/smfserver/smfserver.pro	Fri May 21 16:43:17 2010 +0100
@@ -22,11 +22,10 @@
 include(transportmgr/transportmgr.pri)
 
 !symbian {
-    # On desktop, we need to include these locally, as there is
-    # no /epoc32/include available.
-    INCLUDEPATH += ../util/qjson/src
-    LIBS += -L../util/qjson/lib -lqjson
+    include(../../desktop.pri)
     include(../smfclient/common/common.pri)
+
+    LIBS += -lqjson
 }
 
 PUBLIC_HEADERS += \

--- a/smf/smfservermodule/util/qjson/src/src.pro	Fri May 21 15:45:10 2010 +0100
+++ b/smf/smfservermodule/util/qjson/src/src.pro	Fri May 21 16:43:17 2010 +0100
@@ -4,9 +4,13 @@
 TEMPLATE = lib
 QT      -= gui
 TARGET   = qjson
-DESTDIR  = $$QJSON_BASE/lib
 CONFIG += create_prl
 
+# SMF dest directory for desktop builds
+!symbian {
+    include(../../../../desktop.pri)
+}
+
 VERSION = 0.7.1
 
 windows: {