diff options
| author | Thorsten Behrens <tbehrens@suse.com> | 2012-01-16 18:44:38 +0100 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2012-01-16 19:12:56 +0100 |
| commit | a3849747a393a16a0d11ef91236cc9a910e73f18 (patch) | |
| tree | b3f1c89ddb0e93193fd3ca8808c9637a13c9cac2 /desktop/Zip_brand_dev.mk | |
| parent | 09a25659775c4d39eb40507e7cbd9472570834d3 (diff) | |
Fix configurable branding.
Bin the submakefile, use direct Zip cp calls. This also fixes
the non-working deps towards default_images.
Diffstat (limited to 'desktop/Zip_brand_dev.mk')
| -rw-r--r-- | desktop/Zip_brand_dev.mk | 45 |
1 files changed, 41 insertions, 4 deletions
diff --git a/desktop/Zip_brand_dev.mk b/desktop/Zip_brand_dev.mk index 72f2261fb10c..b554a69b5a89 100644 --- a/desktop/Zip_brand_dev.mk +++ b/desktop/Zip_brand_dev.mk @@ -25,11 +25,48 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_Zip_Zip,brand_dev/intro,$(SRCDIR)/icon-themes/galaxy/brand_dev)) +$(eval $(call gb_Zip_Zip,brand_dev/intro,$(WORKDIR)/Zip/brand_intro_dev)) -$(eval $(call gb_Zip_add_files,brand_dev/intro,\ - about.png \ - intro.png \ +$(eval $(call gb_Zip_add_file,brand_dev/intro,about.png,\ + $(if $(ABOUT_BITMAP),\ + $(ABOUT_BITMAP),\ + $(SRCDIR)/icon-themes/galaxy/brand_dev/about.png)\ +)) + +$(eval $(call gb_Zip_add_file,brand_dev/intro,intro.png,\ + $(if $(INTRO_BITMAP),\ + $(INTRO_BITMAP),\ + $(SRCDIR)/icon-themes/galaxy/brand_dev/intro.png)\ +)) + +$(eval $(call gb_Zip_add_file,brand_dev/intro,shell/backing_left.png,\ + $(if $(STARTCENTER_LEFT_BITMAP),\ + $(STARTCENTER_LEFT_BITMAP),\ + $(SRCDIR)/icon-themes/galaxy/brand/shell/backing_left.png)\ +)) + +$(eval $(call gb_Zip_add_file,brand_dev/intro,shell/backing_right.png,\ + $(if $(STARTCENTER_RIGHT_BITMAP),\ + $(STARTCENTER_RIGHT_BITMAP),\ + $(SRCDIR)/icon-themes/galaxy/brand/shell/backing_right.png)\ +)) + +$(eval $(call gb_Zip_add_file,brand_dev/intro,shell/backing_space.png,\ + $(if $(STARTCENTER_SPACE_BITMAP),\ + $(STARTCENTER_SPACE_BITMAP),\ + $(SRCDIR)/icon-themes/galaxy/brand/shell/backing_space.png)\ +)) + +$(eval $(call gb_Zip_add_file,brand_dev/intro,shell/backing_rtl_left.png,\ + $(if $(STARTCENTER_RTL_LEFT_BITMAP),\ + $(STARTCENTER_RTL_LEFT_BITMAP),\ + $(SRCDIR)/icon-themes/galaxy/brand/shell/backing_rtl_left.png)\ +)) + +$(eval $(call gb_Zip_add_file,brand_dev/intro,shell/backing_rtl_right.png,\ + $(if $(STARTCENTER_RTL_RIGHT_BITMAP),\ + $(STARTCENTER_RTL_RIGHT_BITMAP),\ + $(SRCDIR)/icon-themes/galaxy/brand/shell/backing_rtl_right.png)\ )) # vim: set ts=4 sw=4 et: |