From 45b95190860d714f7dba9dcca452931c199581a5 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Sat, 4 May 2013 14:10:11 +0200
Subject: $(WORKDIR)/CustomTarget/odk/odkcommon is no more

Change-Id: I49204b3518c47614e591de47a916901861331673
Reviewed-on: https://gerrit.libreoffice.org/3777
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
---
 odk/CustomTarget_check.mk |  1 -
 odk/util/check.pl         | 13 ++++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'odk')

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 74415a2bbf73..fb5b2d5aa34a 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -50,7 +50,6 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 	$(call gb_Helper_print_on_error,\
 		$(PERL) $< \
 			$(INSTDIR)/$(gb_Package_SDKDIRNAME) \
-			$(call gb_CustomTarget_get_workdir,odk/odkcommon) \
 			$(odk_PLATFORM) "$(gb_Executable_EXT)" \
 		,$@.log \
 	)
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 542361e44cd0..5a2df1681dc9 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -23,26 +23,25 @@
 
 $return = 0;
 
-$PrimaryDir = "$ARGV[0]";
-$SecondaryDir = "$ARGV[1]";
-$OperatingSystem = "$ARGV[2]";
-$ExePrefix = "$ARGV[3]";
+$SdkDir = "$ARGV[0]";
+$OperatingSystem = "$ARGV[1]";
+$ExePrefix = "$ARGV[2]";
 
 sub check_file
 {
     my ($file) = @_;
-    return -e "$PrimaryDir/$file" || -e "$SecondaryDir/$file";
+    return -e "$SdkDir/$file";
 }
 
 sub check_dir
 {
     my ($dir) = @_;
-    return -d "$PrimaryDir/$dir" || -d "$SecondaryDir/$dir";
+    return -d "$SdkDir/$dir";
 }
 
 print "Check for $OperatingSystem\n";
 
-if (-d "$PrimaryDir" || -d "$SecondaryDir") {
+if (-d "$SdkDir") {
     # check binaries
     print "check binaries: ";
     if (check_dir("bin")) {
-- 
cgit