diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2013-02-26 17:42:05 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-02-27 14:52:42 +0000 |
| commit | 87c57d871c65b4669a54fed009b16c5f37acbbf8 (patch) | |
| tree | eccd8f585e99d0af6d63f16825bd735ea78f6e34 /instsetoo_native | |
| parent | 7312c381a505e3b25f147f650f64761268062159 (diff) | |
move instsetoo_native to gbuild
Change-Id: Ie4deddc426356636b76ad4fc27552c6d3a1dd815
Reviewed-on: https://gerrit.libreoffice.org/2429
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/CustomTarget_install.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index 6f12965cce49..1135616ce542 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -28,7 +28,8 @@ $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/install,\ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: \ $(SOLARENV)/bin/make_installer.pl \ - $(foreach ulf,$(instsetoo_ULFLIST),$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/$(ulf).ulf) + $(foreach ulf,$(instsetoo_ULFLIST),$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/$(ulf).ulf) \ + $(call gb_Postprocess_get_target,AllModulesButInstsetNative) $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/bin/find-requires-%.sh: $(SRCDIR)/instsetoo_native/inc_openoffice/unix/find-requires-%.sh cat $< | tr -d "\015" > $@ @@ -37,7 +38,8 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/bin/find-requires-% ifneq ($(WITH_LANG),) $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/%.ulf: \ $(SRCDIR)/instsetoo_native/inc_openoffice/windows/msi_languages/%.ulf | \ - $(call gb_Executable_get_runtime_dependencies,ulfex) + $(call gb_Executable_get_runtime_dependencies,ulfex) \ + $(call gb_Postprocess_get_target,AllModulesButInstsetNative) $(call gb_Output_announce,$@,$(true),SUM,1) MERGEINPUT=`$(gb_MKTEMP)` && \ echo $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/instsetoo_native/inc_openoffice/windows/msi_languages.po) > $${MERGEINPUT} && \ @@ -46,7 +48,8 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/%.ulf: rm -rf $${MERGEINPUT} else $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/%.ulf: \ - $(SRCDIR)/instsetoo_native/inc_openoffice/windows/msi_languages/%.ulf + $(SRCDIR)/instsetoo_native/inc_openoffice/windows/msi_languages/%.ulf \ + $(call gb_Postprocess_get_target,AllModulesButInstsetNative) cp $< $@ endif |