From 78ef8aadd693151b309dea320dc693707880331d Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Fri, 19 Feb 2010 13:52:51 +0100
Subject: Changed check for platform and target to depend on macro existence.

This change was done in order to support build systems that do not
use platform and target in the pkg file.
---
 bin/createpackage.pl | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/bin/createpackage.pl b/bin/createpackage.pl
index dc8f3ef..e4c714e 100755
--- a/bin/createpackage.pl
+++ b/bin/createpackage.pl
@@ -171,14 +171,6 @@ unless (length($templatepkg)) {
     Usage();
 }
 
-# If the pkg file is not actually a template, there is no need for plaform or target.
-if ($templatepkg =~ m/_template\.pkg/i) {
-    unless (length($platform) && length($target)) {
-        print "\nError: Platform or target is not defined!\n";
-        Usage();
-    }
-}
-
 # Check template exist
 stat($templatepkg);
 unless( -e _ ) {
@@ -246,6 +238,14 @@ open( TEMPLATE, $templatepkg) or die "Error '$templatepkg': $!\n";
 $_=<TEMPLATE>;
 close (TEMPLATE);
 
+# If the pkg file does not contain macros, there is no need for platform or target.
+if (m/\$\(PLATFORM\)/) {
+    unless (length($platform) && length($target)) {
+        print "\nError: Platform or target is not defined!\n";
+        Usage();
+    }
+}
+
 # replace the PKG variables
 s/\$\(PLATFORM\)/$platform/gm;
 s/\$\(TARGET\)/$target/gm;
-- 
cgit v0.12