diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-05-10 12:46:15 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-05-10 12:50:25 +0200 |
| commit | a356da4e2adefd86d6f802c0753b3718909e4e4c (patch) | |
| tree | 308cf1bf018137d812497b57c6f6454e8df63126 /desktop/Package_branding.mk | |
| parent | 5d79c18c3201e6fb2ce95055fd1d9201ed919a8b (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.mk | 4 |
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))) \ )) |