Hi, I have submitted a patch for review:
https://gerrit.libreoffice.org/3776 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/76/3776/1 drop unneeded odkcommon/ Change-Id: Id88a58e43fd7a39fdbc7545a0618b05070b1270e --- M odk/CustomTarget_settings.mk M odk/Package_settings_generated.mk 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/odk/CustomTarget_settings.mk b/odk/CustomTarget_settings.mk index 581d522..242dd68 100644 --- a/odk/CustomTarget_settings.mk +++ b/odk/CustomTarget_settings.mk @@ -7,11 +7,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/settings)) +$(eval $(call gb_CustomTarget_CustomTarget,odk/settings)) -$(eval $(call gb_CustomTarget_register_target,odk/odkcommon/settings,dk.mk)) +$(eval $(call gb_CustomTarget_register_target,odk/settings,dk.mk)) -$(call gb_CustomTarget_get_workdir,odk/odkcommon/settings)/dk.mk : $(SRCDIR)/odk/pack/copying/dk.mk +$(call gb_CustomTarget_get_workdir,odk/settings)/dk.mk : $(SRCDIR)/odk/pack/copying/dk.mk $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,SED,1) tr -d "\015" < $< | sed -e 's/@@RELEASE@@/$(PRODUCTVERSION)/' \ -e 's/@@BUILDID@@/$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)/' \ diff --git a/odk/Package_settings_generated.mk b/odk/Package_settings_generated.mk index 3813d98..1b3f637 100644 --- a/odk/Package_settings_generated.mk +++ b/odk/Package_settings_generated.mk @@ -7,7 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,odk_settings_generated,$(call gb_CustomTarget_get_workdir,odk/odkcommon/settings))) +$(eval $(call gb_Package_Package,odk_settings_generated,$(call gb_CustomTarget_get_workdir,odk/settings))) $(eval $(call gb_Package_set_outdir,odk_settings_generated,$(INSTDIR))) -- To view, visit https://gerrit.libreoffice.org/3776 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id88a58e43fd7a39fdbc7545a0618b05070b1270e Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon <dtar...@redhat.com> _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice