mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

$(WORKDIR)/CustomTarget/odk/odkcommon is no more

Browse Source 
Change-Id: I49204b3518c47614e591de47a916901861331673
Reviewed-on: https://gerrit.libreoffice.org/3777
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
This commit is contained in:
David Tardon
2013-05-04 14:10:11 +02:00
parent da7e3fca9f
commit 45b9519086
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
odk/CustomTarget_check.mk
View File

@@ -50,7 +50,6 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
$(call gb_Helper_print_on_error,\ $(call gb_Helper_print_on_error,\
$(PERL) $< \ $(PERL) $< \
$(INSTDIR)/$(gb_Package_SDKDIRNAME) \ $(INSTDIR)/$(gb_Package_SDKDIRNAME) \
$(call gb_CustomTarget_get_workdir,odk/odkcommon) \
$(odk_PLATFORM) "$(gb_Executable_EXT)" \ $(odk_PLATFORM) "$(gb_Executable_EXT)" \
,$@.log \ ,$@.log \
) )

13
odk/util/check.pl
View File

@@ -23,26 +23,25 @@
$return = 0; $return = 0;
$PrimaryDir = "$ARGV[0]"; $SdkDir = "$ARGV[0]";
$SecondaryDir = "$ARGV[1]"; $OperatingSystem = "$ARGV[1]";
$OperatingSystem = "$ARGV[2]"; $ExePrefix = "$ARGV[2]";
$ExePrefix = "$ARGV[3]";
sub check_file sub check_file
{ {
my ($file) = @_; my ($file) = @_;
return -e "$PrimaryDir/$file" || -e "$SecondaryDir/$file"; return -e "$SdkDir/$file";
} }
sub check_dir sub check_dir
{ {
my ($dir) = @_; my ($dir) = @_;
return -d "$PrimaryDir/$dir" || -d "$SecondaryDir/$dir"; return -d "$SdkDir/$dir";
} }
print "Check for $OperatingSystem\n"; print "Check for $OperatingSystem\n";
if (-d "$PrimaryDir" || -d "$SecondaryDir") { if (-d "$SdkDir") {
# check binaries # check binaries
print "check binaries: "; print "check binaries: ";
if (check_dir("bin")) { if (check_dir("bin")) {