[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - ios/CustomTarget_iOS_setup.mk

[Tor Lillqvist (via logerrit)]

 ios/CustomTarget_iOS_setup.mk |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit e9c3426fbe33dbe3f267959b1e6c8ef3aff5bb5e
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Aug 26 16:19:47 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Sep 16 14:38:31 2019 +0200

    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 at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/78999

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index f49b1ff19185..3ae6bd9c20d1 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -21,7 +21,7 @@ IOSDIRS = $(IOSGEN) \
 		  $(IOSRES)/program \
 		  $(IOSRES)/share \
 		  $(IOSRES)/config \
-		  $(IOSRES)/filter
+		  $(IOSRES)/share/filter
 
 
 #- Top level  -----------------------------------------------------------------
@@ -59,9 +59,9 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
 	cp -R $(INSTDIR)/program/resource $(IOSRES)/program
 	mkdir -p $(IOSRES)/share/config
 	cp -R $(INSTDIR)/share/config/soffice.cfg $(IOSRES)/share/config
-	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