summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2019-08-26 16:19:47 +0300
committerTor Lillqvist <tml@collabora.com>2019-08-26 15:40:48 +0200
commit5f24677ec3688c739340bce6ccaf27d31d18b280 (patch)
treec37986828e4871867397db3957e9e4d3d787de25
parent90edf4ac6e9760b2166a80f8c866d4e5c387b3d1 (diff)
Use correct directory for some data files on iOS: share/filter, not filter
Change-Id: Idd7d675872b73454d78576ed231fe90644dbe4c5 Reviewed-on: https://gerrit.libreoffice.org/78142 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
-rw-r--r--ios/CustomTarget_iOS_setup.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 3f5b10f270bf..75af10fe3598 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -23,7 +23,7 @@ $(call gb_CustomTarget_get_target,ios/iOS_setup): $(IOSGEN)/native-code.h
$(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_iOS_setup.mk
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
mkdir -p $(IOSGEN) $(IOSRES) $(IOSRES)/services \
- $(IOSRES)/share/config $(IOSRES)/filter $(IOSRES)/program \
+ $(IOSRES)/share/config $(IOSRES)/share/filter $(IOSRES)/program \
$(IOSRES)/config
# generate file with call declarations
@@ -42,9 +42,9 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_i
mkdir -p $(IOSRES)/share/config
cp -R $(INSTDIR)/share/config/soffice.cfg $(IOSRES)/share/config
cp $(WORKDIR)/CustomTarget/i18npool/breakiterator/dict_*.data $(IOSRES)/share
- cp $(INSTDIR)/share/filter/oox-drawingml-adj-names $(IOSRES)/filter
- cp $(INSTDIR)/share/filter/oox-drawingml-cs-presets $(IOSRES)/filter
- cp $(INSTDIR)/share/filter/vml-shape-types $(IOSRES)/filter
+ cp $(INSTDIR)/share/filter/oox-drawingml-adj-names $(IOSRES)/share/filter
+ cp $(INSTDIR)/share/filter/oox-drawingml-cs-presets $(IOSRES)/share/filter
+ cp $(INSTDIR)/share/filter/vml-shape-types $(IOSRES)/share/filter
cp -R $(INSTDIR)/share/registry $(IOSRES)
cp $(INSTDIR)/share/config/*zip $(IOSRES)/share/config
cp -R $(INSTDIR)/share/liblangtag $(IOSRES)/share