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 /postprocess | |
| 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 'postprocess')
| -rw-r--r-- | postprocess/Package_images_install.mk | 2 | ||||
| -rw-r--r-- | postprocess/Package_registry_install.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/postprocess/Package_images_install.mk b/postprocess/Package_images_install.mk index af0f269d8d87..b7ad4e2aca6f 100644 --- a/postprocess/Package_images_install.mk +++ b/postprocess/Package_images_install.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,postprocess_images_install,$(call gb_CustomTarg $(eval $(call gb_Package_set_outdir,postprocess_images_install,$(INSTDIR))) -$(eval $(call gb_Package_add_files,postprocess_images_install,share/config,\ +$(eval $(call gb_Package_add_files,postprocess_images_install,$(LIBO_SHARE_FOLDER)/config,\ $(if $(filter default,$(WITH_THEMES)),images.zip) \ $(foreach theme,$(filter-out default,$(WITH_THEMES)),images_$(theme).zip) \ )) diff --git a/postprocess/Package_registry_install.mk b/postprocess/Package_registry_install.mk index c79d839321a7..d21d2a28d722 100644 --- a/postprocess/Package_registry_install.mk +++ b/postprocess/Package_registry_install.mk @@ -11,14 +11,14 @@ $(eval $(call gb_Package_Package,postprocess_registry_install,$(call gb_CustomTa $(eval $(call gb_Package_set_outdir,postprocess_registry_install,$(INSTDIR))) -$(eval $(call gb_Package_add_files,postprocess_registry_install,share/registry,\ +$(eval $(call gb_Package_add_files,postprocess_registry_install,$(LIBO_SHARE_FOLDER)/registry,\ $(postprocess_XCDS) \ $(foreach lang,$(gb_Configuration_LANGS), \ Langpack-$(lang).xcd \ ) \ )) -$(eval $(call gb_Package_add_files,postprocess_registry_install,share/registry/res,\ +$(eval $(call gb_Package_add_files,postprocess_registry_install,$(LIBO_SHARE_FOLDER)/registry/res,\ $(foreach lang,$(gb_Configuration_LANGS), \ fcfg_langpack_$(lang).xcd \ registry_$(lang).xcd \ |