diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-09 00:44:21 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-09 22:09:13 +0200 |
| commit | b3b641090041f5708021f23272724a28fd61c73d (patch) | |
| tree | b0d3dadfd6ea04509250bb8362101b1af4d48ed1 | |
| parent | 6ec243f58d992ae9458c2ccd81f08a3d0ccf59bf (diff) | |
desktop: put soffice.bin in INSTDIR too
Change-Id: Icfafff9120cae51c32ebfd87267e664f18f7ec8a
| -rw-r--r-- | desktop/Package_soffice_bin.mk | 4 | ||||
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/desktop/Package_soffice_bin.mk b/desktop/Package_soffice_bin.mk index d542cb46250f..923742697631 100644 --- a/desktop/Package_soffice_bin.mk +++ b/desktop/Package_soffice_bin.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,desktop_soffice_bin,$(gb_Executable_BINDIR))) -$(eval $(call gb_Package_add_file,desktop_soffice_bin,bin/soffice.bin,soffice_bin$(gb_Executable_EXT))) +$(eval $(call gb_Package_set_outdir,desktop_soffice_bin,$(INSTDIR))) + +$(eval $(call gb_Package_add_file,desktop_soffice_bin,$(LIBO_BIN_FOLDER)/soffice.bin,soffice_bin$(gb_Executable_EXT))) # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 5d95ba7e1105..9692776c159c 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -537,10 +537,17 @@ End #ifndef MACOSX File gid_Brand_File_Bin_Soffice_Bin +#ifdef WNT +// FIXME quick hack + Dir = FILELIST_DIR; + Name = "desktop_soffice_bin.filelist"; + Styles = (FILELIST, PACKED); +#else BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; Styles = (PACKED); Name = "soffice.bin"; +#endif End #endif |