Fix "make sis" for projects that have empty OBJECTS_DIR
authorMiikka Heikkinen <miikka.heikkinen@digia.com>
Tue, 12 Apr 2011 12:23:33 +0000 (15:23 +0300)
committerOlivier Goffart <olivier.goffart@nokia.com>
Tue, 10 May 2011 10:54:45 +0000 (12:54 +0200)
Temp directory for packagaging got created to system root if
OBJECTS_DIR was empty. Fixed it to use '.' instead in those cases.

Reviewed-by: Janne Koskinen
(cherry picked from commit 930db5826ff2c02d54f2851494000c5fab97da54)

mkspecs/features/symbian/sis_targets.prf

index d0fe881..f3452b7 100644 (file)
@@ -26,7 +26,11 @@ equals(GENERATE_SIS_TARGETS, true) {
 
     qtPrepareTool(QMAKE_CREATEPACKAGE, createpackage)
 
-    CREATEPACKAGE_DIR = $$OBJECTS_DIR/createpackage_tmp
+    sis_objects_dir = $$OBJECTS_DIR
+    isEmpty(sis_objects_dir):sis_objects_dir = .
+
+    CREATEPACKAGE_DIR = $$sis_objects_dir/createpackage_tmp
+
     QMAKE_CLEAN += $$CREATEPACKAGE_DIR/*
 
     symbian-abld|symbian-sbsv2 {