diff options
| -rw-r--r-- | setup_native/Module_setup_native.mk | 1 | ||||
| -rw-r--r-- | setup_native/Package_ulf.mk | 16 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/globals.pm | 2 |
3 files changed, 1 insertions, 18 deletions
diff --git a/setup_native/Module_setup_native.mk b/setup_native/Module_setup_native.mk index 4228ea88436a..19226c2274a3 100644 --- a/setup_native/Module_setup_native.mk +++ b/setup_native/Module_setup_native.mk @@ -18,7 +18,6 @@ $(eval $(call gb_Module_add_targets,setup_native,\ ifeq ($(OS),MACOSX) $(eval $(call gb_Module_add_targets,setup_native,\ CustomTarget_mac \ - Package_ulf \ )) endif diff --git a/setup_native/Package_ulf.mk b/setup_native/Package_ulf.mk deleted file mode 100644 index 1f58bcabf86d..000000000000 --- a/setup_native/Package_ulf.mk +++ /dev/null @@ -1,16 +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,setup_native/ulf,$(call gb_CustomTarget_get_workdir,setup_native/mac))) - -$(eval $(call gb_Package_set_outdir,setup_native/ulf,$(OUTDIR))) - -$(eval $(call gb_Package_add_file,setup_native/ulf,bin/macinstall.ulf,macinstall.ulf)) - -# vim: set noet sw=4 ts=4: diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index 23b76d06afca..bf0dba6823b6 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -244,7 +244,7 @@ BEGIN @packagelistitems = ("module", "solarispackagename", "packagename", "copyright", "vendor", "description" ); @featurecollector =(); $msiassemblyfiles = ""; - $macinstallfilename = "macinstall.ulf"; + $macinstallfilename = $ENV{'WORKDIR'} . "/CustomTarget/setup_native/mac/macinstall.ulf"; $extensioninstalldir = "gid_Dir_Share_Extension_Install"; @languagenames = (); %componentcondition = (); |