diff options
author | Tor Lillqvist <tml@collabora.com> | 2013-09-25 20:42:34 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2013-09-25 22:13:23 +0200 |
commit | 7a8db272e95e0d3255b515567ed5e00738cf6760 (patch) | |
tree | e46475b2aeabffd00e117c9ebe46eec60226fed2 /desktop/Package_branding_custom.mk | |
parent | aa26a065867c36a412193db9854cf2ca97154dde (diff) |
Start hacking --enable-canonical-installation-tree-structure back into shape
Had been totaly broken by the recent changes. (Which is fine, it is
just an experimental hack anyway, I am not sure whether it will ever
be used in anger. Just a pet peeve of mine, I dislike seeing
libraries, configuration files, resources etc mixed together in one
"program" folder, especially on OS X, where the convention is to have
app-specific dylibs and frameworks in "Frameworks", and resource files
in "Resources". But this is not any requirement as such; there are
apps in the Mac App Store that blatantly "break" this convention.)
Basically, replace uses of gb_PROGRAMDIRNAME and
gb_Package_PROGRAMDIRNAME with more specific LIBO_FOO_FOLDER, which
for normal builds all expand to the same "program" anyway.
Change-Id: I16c2b3351caa00e251e229aafbccb8346042d3c1
Diffstat (limited to 'desktop/Package_branding_custom.mk')
-rw-r--r-- | desktop/Package_branding_custom.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/desktop/Package_branding_custom.mk b/desktop/Package_branding_custom.mk index e7ceefd3bd0a..456d545ee7c0 100644 --- a/desktop/Package_branding_custom.mk +++ b/desktop/Package_branding_custom.mk @@ -11,11 +11,11 @@ $(eval $(call gb_Package_Package,desktop_branding_custom,$(CUSTOM_BRAND_DIR))) $(eval $(call gb_Package_set_outdir,desktop_branding_custom,$(INSTROOT))) -$(eval $(call gb_Package_add_files,desktop_branding_custom,$(gb_PROGRAMDIRNAME),\ +$(eval $(call gb_Package_add_files,desktop_branding_custom,$(LIBO_ETC_FOLDER),\ $(filter $(BRAND_INTRO_IMAGES),$(CUSTOM_BRAND_IMAGES)) \ )) -$(eval $(call gb_Package_add_files,desktop_branding_custom,$(gb_PROGRAMDIRNAME)/shell,\ +$(eval $(call gb_Package_add_files,desktop_branding_custom,$(LIBO_ETC_FOLDER)/shell,\ $(filter-out $(BRAND_INTRO_IMAGES),$(CUSTOM_BRAND_IMAGES)) \ )) |