diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-02-09 18:06:48 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-02-09 18:07:26 +0100 |
| commit | 57e6d742a9e2aeb11b179122991e7d35ca54543c (patch) | |
| tree | c72eae79a692aa05aa8d5e3a0ac2370b82639bb0 | |
| parent | Fuck that left-behind .lck file (diff) | |
| download | core-57e6d742a9e2aeb11b179122991e7d35ca54543c.tar.gz core-57e6d742a9e2aeb11b179122991e7d35ca54543c.zip | |
On Mac OS X, directly name the executable "unopkg"
Change-Id: I5f846d7f7c5ed54179504f551e19227f7283bda2
| -rw-r--r-- | RepositoryFixes.mk | 2 | ||||
| -rw-r--r-- | desktop/Package_scripts.mk | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 13 |
3 files changed, 2 insertions, 15 deletions
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index bbffb96a153b..19a57323249a 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 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 7a4e5b1bfa2c..9650c181d2a7 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -86,9 +86,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 @@ -532,16 +529,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; |