summaryrefslogtreecommitdiff
path: root/desktop/Package_branding.mk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-05-10 12:46:15 +0200
committerPetr Mladek <pmladek@suse.cz>2013-05-29 14:42:54 +0200
commit51a32bbd323bf513310fb4d82d53e52b8b247f57 (patch)
tree5cad8ed06b0dd6dda4865881f2f81b9dfa3dcf76 /desktop/Package_branding.mk
parentc8ce9f6d498ea0d9f09d96fac63a4a2a1c619edc (diff)
Abstract over PACKAGEDIRNAME as it is MacOS rather than program on Mac OS X
Otherwise, the FILELIST scp2 items would create a program directory even on Mac OS X, before gid_Brand_Unixlink_Program creates the program -> MacOS symlink. (gb_Pyuno_PROGRAMDIRNAME shoudl be renamed to something more general than Pyuno, and maybe more */Package_*.mk would benefit from using it.) Change-Id: Ib6fc8d1abaf3b1a47a0f026a62bf0abdb14fc521
Diffstat (limited to 'desktop/Package_branding.mk')
-rw-r--r--desktop/Package_branding.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/desktop/Package_branding.mk b/desktop/Package_branding.mk
index 47186bc5b4c9..25909e85c7fe 100644
--- a/desktop/Package_branding.mk
+++ b/desktop/Package_branding.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,desktop_branding,$(SRCDIR)/icon-themes/galaxy))
$(eval $(call gb_Package_set_outdir,desktop_branding,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,desktop_branding,program,\
+$(eval $(call gb_Package_add_files,desktop_branding,$(gb_Pyuno_PROGRAMDIRNAME),\
$(foreach image,$(filter $(BRAND_INTRO_IMAGES),$(DEFAULT_BRAND_IMAGES)),\
$(if $(filter intro.png,$(image)),\
$(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),brand,brand_dev)/$(image),\
@@ -20,7 +20,7 @@ $(eval $(call gb_Package_add_files,desktop_branding,program,\
) \
))
-$(eval $(call gb_Package_add_files,desktop_branding,program/shell,\
+$(eval $(call gb_Package_add_files,desktop_branding,$(gb_Pyuno_PROGRAMDIRNAME)/shell,\
$(addprefix brand/shell/,$(filter-out $(BRAND_INTRO_IMAGES),$(DEFAULT_BRAND_IMAGES))) \
))