summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-02-09 18:06:48 +0100
committerNorbert Thiebaud <nthiebaud@gmail.com>2015-02-10 14:13:57 +0000
commit51131616c3244234cfd23e18d871622574dd66c8 (patch)
treef49e99eb0984ccf493473515a4859159419cfce3
parent89dfb8d732312b452c53c9522f75fb2eb61561c8 (diff)
On Mac OS X, directly name the executable "unopkg"
Change-Id: I5f846d7f7c5ed54179504f551e19227f7283bda2 (cherry picked from commit 57e6d742a9e2aeb11b179122991e7d35ca54543c) Reviewed-on: https://gerrit.libreoffice.org/14397 Tested-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
-rw-r--r--RepositoryFixes.mk2
-rw-r--r--desktop/Package_scripts.mk2
-rw-r--r--scp2/source/ooo/common_brand.scp13
3 files changed, 2 insertions, 15 deletions
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 6023b04c1ef0..7500e2f9f458 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -25,7 +25,7 @@ gb_Executable_FILENAMES := $(foreach group,$(gb_Executable_VALIDGROUPS),\
ifneq (,$(filter-out MACOSX WNT,$(OS)))
gb_Executable_FILENAMES := $(patsubst uno:uno,uno:uno.bin,$(gb_Executable_FILENAMES))
endif
-gb_Executable_FILENAMES := $(patsubst unopkg_bin:unopkg_bin%,unopkg_bin:unopkg.bin,$(gb_Executable_FILENAMES))
+gb_Executable_FILENAMES := $(patsubst unopkg_bin:unopkg_bin%,unopkg_bin:unopkg$(if $(filter-out MACOSX,$(OS)),.bin),$(gb_Executable_FILENAMES))
gb_Executable_FILENAMES := $(patsubst unopkg_com:unopkg_com%,unopkg_com:unopkg.com,$(gb_Executable_FILENAMES))
gb_Executable_FILENAMES := $(patsubst crashrep_com:crashrep_com%,crashrep_com:crashrep.com,$(gb_Executable_FILENAMES))
gb_Executable_FILENAMES := $(patsubst gengal:gengal,gengal:gengal.bin,$(gb_Executable_FILENAMES))
diff --git a/desktop/Package_scripts.mk b/desktop/Package_scripts.mk
index 3c86abe88e90..a806c72ef120 100644
--- a/desktop/Package_scripts.mk
+++ b/desktop/Package_scripts.mk
@@ -12,13 +12,13 @@ $(eval $(call gb_Package_Package,desktop_scripts_install,$(SRCDIR)/desktop/scrip
ifeq (,$(filter MACOSX WNT,$(OS)))
$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/gdbtrace,gdbtrace))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/unopkg,unopkg.sh))
endif
ifneq ($(OS),WNT)
$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/unoinfo,$(if $(filter MACOSX,$(OS)),unoinfo-mac.sh,unoinfo.sh)))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/unopkg,unopkg.sh))
endif
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index a8669295b2f9..8d1645274bdc 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -89,9 +89,6 @@ Module gid_Module_Root_Brand
git_License_Odt,
gid_Credits_Odt,
gid_Apache_Notice);
-#if defined MACOSX
- Unixlinks = (gid_Brand_Unixlink_Unopkg);
-#endif
End
// Language specific brand module
@@ -535,16 +532,6 @@ File gid_Brand_File_Script_Unopkg
End
#endif
-#if defined MACOSX
-Unixlink gid_Brand_Unixlink_Unopkg
- BIN_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
- Name = "unopkg";
- Target = "unopkg.bin";
- Styles = ();
-End
-#endif
-
File gid_Brand_File_Bmp_IntroAboutShell
TXT_FILE_BODY;
Dir = FILELIST_DIR;