diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-30 16:56:19 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-31 10:42:23 +0100 |
| commit | 2a0a670945f9af760a1e8471427b63099dde9f56 (patch) | |
| tree | fe61bef0fbd2befaff0da4961d3650707f7ee38e /setup_native | |
| parent | 1860d65a78740eae66515cedefbcd3bf3ca37d5b (diff) | |
setup_native: remove Package_scripts_generated
... instead add an include path to the installer.
Change-Id: I5650d5d1d84620a04a9a92825733f3927da2053d
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/Module_setup_native.mk | 1 | ||||
| -rw-r--r-- | setup_native/Package_scripts_generated.mk | 25 |
2 files changed, 0 insertions, 26 deletions
diff --git a/setup_native/Module_setup_native.mk b/setup_native/Module_setup_native.mk index 2e0c6ec5312a..4228ea88436a 100644 --- a/setup_native/Module_setup_native.mk +++ b/setup_native/Module_setup_native.mk @@ -57,7 +57,6 @@ endif $(eval $(call gb_Module_add_targets,setup_native,\ CustomTarget_scripts \ Package_scripts \ - Package_scripts_generated \ )) endif diff --git a/setup_native/Package_scripts_generated.mk b/setup_native/Package_scripts_generated.mk deleted file mode 100644 index ef157310fc4b..000000000000 --- a/setup_native/Package_scripts_generated.mk +++ /dev/null @@ -1,25 +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,scripts_generated,$(call gb_CustomTarget_get_workdir,setup_native/scripts))) - -$(eval $(call gb_Package_set_outdir,scripts_generated,$(OUTDIR))) - -ifeq ($(OS),SOLARIS) -$(eval $(call gb_Package_add_file,scripts_generated,bin/userscripts/install,install)) -$(eval $(call gb_Package_add_file,scripts_generated,bin/userscripts/uninstall,uninstall)) -endif - -ifeq ($(OS),LINUX) -ifneq ($(filter rpm,$(PKGFORMAT)),) -$(eval $(call gb_Package_add_file,scripts_generated,bin/userscripts/install,install)) -$(eval $(call gb_Package_add_file,scripts_generated,bin/userscripts/uninstall,uninstall)) -endif -endif -# vim: set noet sw=4 ts=4: |