diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-09-10 11:35:20 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-09-10 11:38:01 +0300 |
| commit | be4b57b6da08231635f843529fed6fa53c931d02 (patch) | |
| tree | b4e7fa52161ac738fcb765883d20a799d11550a6 /android | |
| parent | Don't bother building the DocumentLoader Android app every time (diff) | |
| download | core-be4b57b6da08231635f843529fed6fa53c931d02.tar.gz core-be4b57b6da08231635f843529fed6fa53c931d02.zip | |
Copy some stuff from INSTDIR, not OUTDIR
Some of it is not in OUTDIR at all any more.
Change-Id: I1afbaafa0fe5a355158b44fcafd3d3e190fce79c
Diffstat (limited to 'android')
| -rw-r--r-- | android/experimental/desktop/Makefile | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile index 4d4fe6d4eb04..25cc0fbf21bb 100644 --- a/android/experimental/desktop/Makefile +++ b/android/experimental/desktop/Makefile @@ -114,7 +114,7 @@ copy-stuff: # ------------ Pieces not from DocumentLoader ------------ # tango artwork / icons mkdir -p assets/share/config - cp -R $(OUTDIR)/bin/images_tango.zip assets/share/config + cp -R $(INSTDIR)/$(LIBO_SHARE_FOLDER)/config/images_tango.zip assets/share/config # shell / splash images mkdir -p assets/program cp -r $(SRC_ROOT)/icon-themes/galaxy/brand/* assets/program @@ -142,15 +142,15 @@ setup-jars: # # Copy jar files we need # - for F in $(strip \ - java_uno \ - juh \ - jurt \ - ridl \ - unoil \ - unoloader \ - ); do \ - $(call COPYJAR,$(OUTDIR)/bin/$${F}.jar); \ + for F in java_uno \ + juh \ + jurt \ + ridl \ + unoloader; do \ + $(call COPYJAR,$(INSTDIR)/$(LIBO_URE_SHARE_JAVA_FOLDER)/$${F}.jar); \ + done + for F in unoil; do \ + $(call COPYJAR,$(INSTDIR)/$(LIBO_SHARE_JAVA_FOLDER)/$${F}.jar); \ done build-ant: android_version_setup copy-stuff link-so properties setup-jars |