|
 |
7131de |
From 83e27fc67d81b76daea4ab0741cf5799456d867f Mon Sep 17 00:00:00 2001
|
|
|
7131de |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
7131de |
Date: Thu, 23 Jan 2020 10:16:38 +0000
|
|
|
7131de |
Subject: [PATCH] make install-unpacked flattens the python hierarchy so result
|
|
|
7131de |
doesn't work
|
|
|
7131de |
|
|
|
7131de |
the original oxt has the correct hierarchy but 'install' flattened it
|
|
|
7131de |
|
|
|
7131de |
Resolves:
|
|
|
7131de |
https://github.com/voikko/libreoffice-voikko/issues/11
|
|
|
7131de |
https://bugzilla.redhat.com/show_bug.cgi?id=1676830
|
|
|
7131de |
https://bugs.documentfoundation.org/show_bug.cgi?id=122984
|
|
|
7131de |
---
|
|
|
7131de |
Makefile | 6 ++----
|
|
|
7131de |
1 file changed, 2 insertions(+), 4 deletions(-)
|
|
|
7131de |
|
|
|
7131de |
diff --git a/Makefile b/Makefile
|
|
|
7131de |
index 18eaff6..da085f3 100644
|
|
|
7131de |
--- a/Makefile
|
|
|
7131de |
+++ b/Makefile
|
|
|
7131de |
@@ -98,10 +98,8 @@ all: oxt
|
|
|
7131de |
|
|
|
7131de |
install-unpacked: extension-files
|
|
|
7131de |
install -m 755 -d "$(DESTDIR)" "$(DESTDIR)/META-INF"
|
|
|
7131de |
- install -m 644 build/oxt/META-INF/manifest.xml "$(DESTDIR)/META-INF"
|
|
|
7131de |
- install -m 644 build/oxt/description.xml \
|
|
|
7131de |
- $(patsubst %,build/oxt/%,$(STANDALONE_EXTENSION_FILES)) \
|
|
|
7131de |
- $(patsubst %,build/oxt/%,$(COPY_TEMPLATES)) $(DESTDIR)
|
|
|
7131de |
+ install -m 755 -d "$(DESTDIR)" "$(DESTDIR)/pythonpath"
|
|
|
7131de |
+ cd oxt && find . -type f -exec install -D {} $(DESTDIR)/{} \;
|
|
|
7131de |
|
|
|
7131de |
# Sed scripts for modifying templates
|
|
|
7131de |
DESCRIPTION_SEDSCRIPT:=s/VOIKKO_VERSION/$(VOIKKO_VERSION)/g
|
|
|
7131de |
--
|
|
|
7131de |
2.24.1
|
|
|
7131de |
|