setup_native: remove Package_ulf
... instead hard-code macinstall.ulf location in installer. Change-Id: I4a6b35c093ff3f4a19d84e8803821909a5ae03db
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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:
|
||||
@@ -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 = ();
|
||||
|
||||
Reference in New Issue
Block a user