From 674a7b44f3b9a90b0b6ed7fa8928ccd0efb597f8 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Tue, 30 Apr 2013 17:44:21 +0200
Subject: 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
---
 desktop/Module_desktop.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'desktop/Module_desktop.mk')

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)
-- 
cgit