summaryrefslogtreecommitdiff
path: root/mkspecs
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-08-13 15:22:25 +0300
committerJesper Thomschutz <jesper.thomschutz@nokia.com>2010-08-17 12:10:26 +0200
commitd4d9df15dd1bf5ad4eb607731a03b917dd32cdb8 (patch)
tree22d25d85eee2139f47507f371bb5dff1cdff55e6 /mkspecs
parentaa53873c722352d513bf68ff7f11570def5900d9 (diff)
downloadqt4-tools-d4d9df15dd1bf5ad4eb607731a03b917dd32cdb8.tar.gz
Fix "installer_sis" and "deploy" targets when TARGET has path
Dependencies got generated wrong in Makefile because sis is always created in the .pro file directory but dependency included path that was in TARGET. Task-number: QTBUG-12884 Reviewed-by: Shane Kearns (cherry picked from commit 434ce6748ea7f082357b6d7ab542c9fa2285bd4c)
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/sis_targets.prf5
1 files changed, 2 insertions, 3 deletions
diff --git a/mkspecs/features/sis_targets.prf b/mkspecs/features/sis_targets.prf
index 615bbe5480..bcfdf8fa75 100644
--- a/mkspecs/features/sis_targets.prf
+++ b/mkspecs/features/sis_targets.prf
@@ -11,7 +11,6 @@ else:!equals(DEPLOYMENT, default_deployment) {
equals(GENERATE_SIS_TARGETS, true) {
symbian-abld|symbian-sbsv2 {
- sis_destdir =
make_cache_name = .make.cache
sis_target.target = sis
sis_target.commands = $(if $(wildcard $$basename(TARGET)_template.pkg), \
@@ -50,7 +49,7 @@ equals(GENERATE_SIS_TARGETS, true) {
ok_unsigned_sis_target.target = ok_unsigned_sis
ok_unsigned_sis_target.commands = createpackage.bat $(QT_SIS_OPTIONS) -o $$basename(TARGET)_template.pkg $(QT_SIS_TARGET)
- target_sis_target.target = $${sis_destdir}$${TARGET}.sis
+ target_sis_target.target = $$basename(TARGET).sis
target_sis_target.commands = $(MAKE) -f $(MAKEFILE) sis
installer_sis_target.target = installer_sis
@@ -59,7 +58,7 @@ equals(GENERATE_SIS_TARGETS, true) {
, \
$(MAKE) -f $(MAKEFILE) fail_sis_nopkg \
)
- installer_sis_target.depends = $${sis_destdir}$${TARGET}.sis
+ installer_sis_target.depends = $$basename(TARGET).sis
ok_installer_sis_target.target = ok_installer_sis
ok_installer_sis_target.commands = createpackage.bat $(QT_SIS_OPTIONS) $$basename(TARGET)_installer.pkg - \