diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-08-18 18:45:45 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-08-18 21:11:16 +0300 |
| commit | 058a3d1c46449dd5159bae30c83db4c2c5c335b4 (patch) | |
| tree | 28fae22c49b9cecdda52aa148dde2aba2b568ff9 /desktop/Package_branding.mk | |
| parent | bd2f7ef662122d5c1202911cb2f3b0ab1e124695 (diff) | |
Further work on the "Mac-like app structure" option
Lots of stuff still either ended up in the wrong place, or was looked up from
the wrong place, or both. Fix most cases.
Change-Id: I06ebbce207c219f3cd82b4387dd9b3fdb83420d4
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 f981708c95e9..c8739fab3ae5 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,$(gb_PROGRAMDIRNAME),\ +$(eval $(call gb_Package_add_files,desktop_branding,$(LIBO_ETC_FOLDER),\ $(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,$(gb_PROGRAMDIRNAME),\ ) \ )) -$(eval $(call gb_Package_add_files,desktop_branding,$(gb_PROGRAMDIRNAME)/shell,\ +$(eval $(call gb_Package_add_files,desktop_branding,$(LIBO_ETC_FOLDER)/shell,\ $(addprefix brand/shell/,$(filter-out $(BRAND_INTRO_IMAGES),$(DEFAULT_BRAND_IMAGES))) \ )) |