diff options
| -rw-r--r-- | Makefile.in | 17 | ||||
| -rw-r--r-- | distro-configs/LibreOfficeFlatpak.conf | 1 | ||||
| -rwxr-xr-x | solenv/bin/assemble-flatpak.sh | 2 | ||||
| -rw-r--r-- | solenv/flatpak-manifest.in | 2 |
4 files changed, 8 insertions, 14 deletions
diff --git a/Makefile.in b/Makefile.in index 8c777a67f4ee..08476e14fd49 100644 --- a/Makefile.in +++ b/Makefile.in @@ -9,7 +9,7 @@ gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck subsequentcheck perfcheck uicheck screenshot -.PHONY : all check-if-root bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install distro-pack-install-strip docs download etags fetch get-submodules id install install-gdb-printers install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS) +.PHONY : all check-if-root bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download etags fetch get-submodules id install install-gdb-printers install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS) MAKECMDGOALS?=all build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\ @@ -390,18 +390,11 @@ else @exit 1 endif -define gb_Top_DistroPackInstall -$(SRCDIR)/bin/distro-install-clean-up -$(SRCDIR)/bin/distro-install-desktop-integration -$(SRCDIR)/bin/distro-install-sdk -$(SRCDIR)/bin/distro-install-file-lists -endef - distro-pack-install: install - $(gb_Top_DistroPackInstall) - -distro-pack-install-strip: install-strip - $(gb_Top_DistroPackInstall) + $(SRCDIR)/bin/distro-install-clean-up + $(SRCDIR)/bin/distro-install-desktop-integration + $(SRCDIR)/bin/distro-install-sdk + $(SRCDIR)/bin/distro-install-file-lists install-package-%: $(MAKE) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@ diff --git a/distro-configs/LibreOfficeFlatpak.conf b/distro-configs/LibreOfficeFlatpak.conf index bb6b12b567c4..60312c31c8f5 100644 --- a/distro-configs/LibreOfficeFlatpak.conf +++ b/distro-configs/LibreOfficeFlatpak.conf @@ -1,5 +1,6 @@ --disable-odk --enable-release-build +--enable-symbols --with-ant-home=/run/build/libreoffice/ant --with-extra-buildid=Flatpak version --with-jdk-home=/usr/lib/sdk/openjdk9/jvm/openjdk-9 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 b9eaa71beb67..70d08916ae8c 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -534,7 +534,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'" ] } |