diff options
| author | David Tardon <dtardon@redhat.com> | 2013-05-04 14:08:33 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-05-04 14:42:30 +0000 |
| commit | da7e3fca9f9b9529a4fa81204b2b22c862bffbb3 (patch) | |
| tree | df6f0d5a3b356645f54464435803ebeaf675d44b /odk | |
| parent | ffa50f643c9bed8a6c5970ba72712a1d68d186a6 (diff) | |
drop unneeded odkcommon/
Change-Id: Id88a58e43fd7a39fdbc7545a0618b05070b1270e
Reviewed-on: https://gerrit.libreoffice.org/3776
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/CustomTarget_settings.mk | 6 | ||||
| -rw-r--r-- | odk/Package_settings_generated.mk | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/odk/CustomTarget_settings.mk b/odk/CustomTarget_settings.mk index 581d522e01fb..242dd686c4fd 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 3813d9899e34..1b3f6379bd57 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))) |