diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-17 15:41:34 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-09 22:08:59 +0200 |
| commit | dca003a486acb63ea7ba6aaba94f6c9d3715b004 (patch) | |
| tree | 2e07882c100badcf16d017819eefa54ef6031335 /postprocess | |
| parent | 031fd222ac94ab30c8e17f96263934bd5e148dd7 (diff) | |
install images with filelists
Change-Id: I3946b44838c659cad12d288c8a1ed5137c3e554e
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/Module_postprocess.mk | 1 | ||||
| -rw-r--r-- | postprocess/Package_images.mk | 10 | ||||
| -rw-r--r-- | postprocess/Package_images_install.mk | 19 |
3 files changed, 5 insertions, 25 deletions
diff --git a/postprocess/Module_postprocess.mk b/postprocess/Module_postprocess.mk index 6a381918e2cd..4baeb6197559 100644 --- a/postprocess/Module_postprocess.mk +++ b/postprocess/Module_postprocess.mk @@ -28,7 +28,6 @@ endif ifneq ($(gb_RUNNABLE_INSTDIR),) $(eval $(call gb_Module_add_targets,postprocess,\ - Package_images_install \ Package_registry_install \ )) endif diff --git a/postprocess/Package_images.mk b/postprocess/Package_images.mk index 97d0f02b25c7..af98789b967e 100644 --- a/postprocess/Package_images.mk +++ b/postprocess/Package_images.mk @@ -1,6 +1,5 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # -# # This file is part of the LibreOffice project. # # This Source Code Form is subject to the terms of the Mozilla Public @@ -10,10 +9,11 @@ $(eval $(call gb_Package_Package,postprocess_images,$(call gb_CustomTarget_get_workdir,postprocess/images))) -$(if $(filter default,$(WITH_THEMES)),\ -$(eval $(call gb_Package_add_file,postprocess_images,bin/images.zip,images.zip))) +$(eval $(call gb_Package_set_outdir,postprocess_images,$(INSTDIR))) -$(foreach theme,$(filter-out default,$(WITH_THEMES)),\ -$(eval $(call gb_Package_add_file,postprocess_images,bin/images_$(theme).zip,images_$(theme).zip))) +$(eval $(call gb_Package_add_files,postprocess_images,$(LIBO_SHARE_FOLDER)/config,\ + $(if $(filter default,$(WITH_THEMES)),images.zip) \ + $(foreach theme,$(filter-out default,$(WITH_THEMES)),images_$(theme).zip) \ +)) # vim: set noet sw=4 ts=4: diff --git a/postprocess/Package_images_install.mk b/postprocess/Package_images_install.mk deleted file mode 100644 index b7ad4e2aca6f..000000000000 --- a/postprocess/Package_images_install.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Package_Package,postprocess_images_install,$(call gb_CustomTarget_get_workdir,postprocess/images))) - -$(eval $(call gb_Package_set_outdir,postprocess_images_install,$(INSTDIR))) - -$(eval $(call gb_Package_add_files,postprocess_images_install,$(LIBO_SHARE_FOLDER)/config,\ - $(if $(filter default,$(WITH_THEMES)),images.zip) \ - $(foreach theme,$(filter-out default,$(WITH_THEMES)),images_$(theme).zip) \ -)) - -# vim: set noet sw=4 ts=4: |