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 /Makefile.in | |
| 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 'Makefile.in')
| -rw-r--r-- | Makefile.in | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/Makefile.in b/Makefile.in index afaa9085cbad..768861f2bcf6 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)\ @@ -382,18 +382,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 $@ |