diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-01-08 10:40:32 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2018-01-09 15:43:38 +0100 |
commit | 8ebc1d2df3bb60ac79d963db384b528bb359264e (patch) | |
tree | a2dd8b2db5ad44d6d5e39ab84a947da1c996d2e9 /solenv | |
parent | 4e96c457f08368843d32337a9a2d9ccefa62839e (diff) |
Let flatpak-builder build .Debug extension
Includes a revert of 58891d589bd8da700f135b098dd50833277c65dc "Add distro-pack-
install-strip target to be used by dev-tools' flatpak/build.sh".
Change-Id: Ie2ba18bc13471b46e8d5f41868bae5aee17ff25f
Reviewed-on: https://gerrit.libreoffice.org/47599
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 0ba869fc5c13a29599fda7eb976b2e7959706e04)
Reviewed-on: https://gerrit.libreoffice.org/47618
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'solenv')
-rwxr-xr-x | solenv/bin/assemble-flatpak.sh | 2 | ||||
-rw-r--r-- | solenv/flatpak-manifest.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/solenv/bin/assemble-flatpak.sh b/solenv/bin/assemble-flatpak.sh index e678b9894b86..3eade815b11b 100755 --- a/solenv/bin/assemble-flatpak.sh +++ b/solenv/bin/assemble-flatpak.sh @@ -8,7 +8,7 @@ # # Assemble Flatpak app files and metadata under /app/, copying from the -# installation tree generated by 'make distro-pack-install-strip' (at +# installation tree generated by 'make distro-pack-install' (at # $PREFIXDIR): set -e diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index eed6a529b18d..25c34377dd88 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -510,7 +510,7 @@ "build-commands": [ "./autogen.sh --prefix=/run/build/libreoffice/inst --with-distro=LibreOfficeFlatpak", "make", - "make distro-pack-install-strip", + "make distro-pack-install", "make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'" ] } |