diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-18 23:34:59 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-09 22:09:15 +0200 |
| commit | 64405aa69f3c4e305f11f2d3ddbddd2bbedbb264 (patch) | |
| tree | f33b5146aa933e8f4f9de3befede54d65c21fd6d /desktop | |
| parent | gbuild: add definition of gb_Executable_LAYER to windows.mk (diff) | |
| download | core-64405aa69f3c4e305f11f2d3ddbddd2bbedbb264.tar.gz core-64405aa69f3c4e305f11f2d3ddbddd2bbedbb264.zip | |
gbuild: avoid packages when copying files into instdir
There should be only two ways how to add file into instdir:
- gb_Helper_install used in gbuild
- gb_Package_set_outdir used also elsewhere,
preferably with scp2 containing its .filelist.
Change-Id: I75ec0ba63f32acf4b56b17dc972f4488edf6a777
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/Module_desktop.mk | 1 | ||||
| -rw-r--r-- | desktop/Package_pagein_install.mk | 22 |
2 files changed, 0 insertions, 23 deletions
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index 05ff062c7c56..1deb99af307b 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -37,7 +37,6 @@ $(eval $(call gb_Module_add_targets,desktop,\ Library_migrationoo3 \ Library_unopkgapp \ $(if $(gb_RUNNABLE_INSTDIR),\ - Package_pagein_install \ Package_scripts_install \ ) \ Package_scripts \ diff --git a/desktop/Package_pagein_install.mk b/desktop/Package_pagein_install.mk deleted file mode 100644 index 8a494274fb44..000000000000 --- a/desktop/Package_pagein_install.mk +++ /dev/null @@ -1,22 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Package_Package,desktop_pagein_install,$(OUTDIR)/bin)) - -$(eval $(call gb_Package_set_outdir,desktop_pagein_install,$(INSTDIR))) - -$(eval $(call gb_Package_add_files,desktop_pagein_install,$(gb_PROGRAMDIRNAME),\ - pagein-calc \ - pagein-common \ - pagein-draw \ - pagein-impress \ - pagein-writer \ -)) - -# vim: set noet sw=4 ts=4: |