diff options
author | David Tardon <dtardon@redhat.com> | 2013-04-30 17:44:21 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2013-04-30 17:50:43 +0200 |
commit | 674a7b44f3b9a90b0b6ed7fa8928ccd0efb597f8 (patch) | |
tree | 44cee4b100632398df260c567d5f713706b95d87 /desktop/Module_desktop.mk | |
parent | 148c7629fc844db690075b9df62677b5e902c9f0 (diff) |
install branding images using filelists
This also reinstates the use of brand_dev/intro.png for non-release
builds, lost with gbuildization of instsetoo_native (commit
1d84e9d1d363bd550129efcbeafe670c0a049dd0).
Change-Id: I43477505c5c9a3d6ec961d640608e6e91379868e
Diffstat (limited to 'desktop/Module_desktop.mk')
-rw-r--r-- | desktop/Module_desktop.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index faed6e301731..751fcf74f75a 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -19,10 +19,9 @@ $(eval $(call gb_Module_add_targets,desktop,\ Library_offacc \ Library_sofficeapp \ $(if $(ENABLE_HEADLESS),,Library_spl) \ - Package_intro \ + Package_branding \ + $(if $(CUSTOM_BRAND_DIR),Package_branding_custom) \ UIConfig_deployment \ - Zip_brand \ - Zip_brand_dev \ )) ifeq ($(OS),LINUX) |