diff options
| author | David Tardon <dtardon@redhat.com> | 2013-04-21 15:08:23 +0200 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-04-22 07:02:39 +0000 |
| commit | e640cd59ea191e82102865ff9729adc070fea293 (patch) | |
| tree | 0985502a110d986a4fe2df44e28ce5b065bf73a8 /odk/CustomTarget_check.mk | |
| parent | 65d3bc8d40f0e10557523117464fa7c2a103636b (diff) | |
allow odk/util/check.pl to use two base dirs
This is in preparation for my plan to move stuff out of odkcommon.zip
and install it using filelists. The moved files will be in
$(INSTDIR)/sdk, not in the Zip's workdir, so we must look for them in
both places.
Change-Id: I7dd224c9067f2dbb522b87b7057ddc02a5fa0cad
Reviewed-on: https://gerrit.libreoffice.org/3527
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'odk/CustomTarget_check.mk')
| -rw-r--r-- | odk/CustomTarget_check.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index cdc83dcce4a5..ae23d3d26c8a 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -25,10 +25,14 @@ odk_PLATFORM := $(if $(filter WNT,$(OS)),\ $(if $(filter MACOSX,$(OS)),macosx,\ $(if $(filter AIX,$(OS)),aix)))))))) -$(call gb_CustomTarget_get_workdir,odk/check)/checkbin: $(SRCDIR)/odk/util/check.pl $(call gb_CustomTarget_get_target,odk/odkcommon) +$(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ + $(SRCDIR)/odk/util/check.pl \ + $(call gb_CustomTarget_get_target,odk/odkcommon) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1) touch $@ - $(PERL) $< $(call gb_CustomTarget_get_workdir,odk/odkcommon) \ + $(PERL) $< \ + $(INSTDIR)/$(gb_Package_SDKDIRNAME) \ + $(call gb_CustomTarget_get_workdir,odk/odkcommon) \ $(odk_PLATFORM) "$(gb_Exectable_EXT)" $@ cat $@ |