[Libreoffice-commits] core.git: 3 commits - desktop/Package_branding_custom.mk desktop/Package_scripts_install.mk desktop/Package_scripts.mk desktop/Package_soffice_sh.mk fpicker/source i18npool/CustomTarget_localedata.mk instsetoo_native/Package_setup.mk moz/ExternalPackage_runtime.mk offapi/UnoApi_offapi.mk oovbaapi/UnoApi_oovbaapi.mk padmin/Package_padmin.mk python3/ExternalPackage_python3.mk python3/GeneratedPackage_python3.mk pyuno/Package_python_shell.mk shell/Package_scripts_gnome.mk shell/Package_scripts_kde.mk shell/Package_scripts.mk shell/Package_senddoc.mk solenv/gbuild

Tor Lillqvist tml at collabora.com
Wed Sep 25 13:16:52 PDT 2013 

 desktop/Package_branding_custom.mk      |    4 -
 desktop/Package_scripts.mk              |    7 +-
 desktop/Package_scripts_install.mk      |   23 ++++---
 desktop/Package_soffice_sh.mk           |    2 
 fpicker/source/aqua/resourceprovider.mm |    1 
 i18npool/CustomTarget_localedata.mk     |    2 
 instsetoo_native/Package_setup.mk       |    2 
 moz/ExternalPackage_runtime.mk          |    2 
 offapi/UnoApi_offapi.mk                 |    2 
 oovbaapi/UnoApi_oovbaapi.mk             |    2 
 padmin/Package_padmin.mk                |    2 
 python3/ExternalPackage_python3.mk      |  100 ++++++++++++++++----------------
 python3/GeneratedPackage_python3.mk     |    2 
 pyuno/Package_python_shell.mk           |    2 
 shell/Package_scripts.mk                |    4 -
 shell/Package_scripts_gnome.mk          |    2 
 shell/Package_scripts_kde.mk            |    2 
 shell/Package_senddoc.mk                |    2 
 solenv/gbuild/AllLangResTarget.mk       |    2 
 solenv/gbuild/CppunitTest.mk            |    2 
 solenv/gbuild/ExternalPackage.mk        |    4 -
 solenv/gbuild/Gallery.mk                |    2 
 solenv/gbuild/Library.mk                |    4 -
 solenv/gbuild/Package.mk                |    2 
 solenv/gbuild/Pagein.mk                 |    2 
 solenv/gbuild/Rdb.mk                    |    2 
 solenv/gbuild/gbuild.mk                 |    2 
 solenv/gbuild/platform/com_MSC_defs.mk  |    2 
 28 files changed, 97 insertions(+), 90 deletions(-)

New commits:
commit 8dd1ff42a209a82ab4384a5768c4f191831a712f
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Sep 25 22:07:57 2013 +0200

    We need <tools/string.hxx>
    
    Change-Id: I0fbdd76fd12a242834e1690ff93558cc885d1768

diff --git a/fpicker/source/aqua/resourceprovider.mm b/fpicker/source/aqua/resourceprovider.mm
index f0a1df8..1b64ffc 100644
--- a/fpicker/source/aqua/resourceprovider.mm
+++ b/fpicker/source/aqua/resourceprovider.mm
@@ -23,6 +23,7 @@
 #include <vcl/fpicker.hrc>
 #include <vcl/svapp.hxx>
 #include <tools/resmgr.hxx>
+#include <tools/string.hxx>
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 
commit 7a8db272e95e0d3255b515567ed5e00738cf6760
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Sep 25 20:42:34 2013 +0200

    Start hacking --enable-canonical-installation-tree-structure back into shape
    
    Had been totaly broken by the recent changes. (Which is fine, it is
    just an experimental hack anyway, I am not sure whether it will ever
    be used in anger. Just a pet peeve of mine, I dislike seeing
    libraries, configuration files, resources etc mixed together in one
    "program" folder, especially on OS X, where the convention is to have
    app-specific dylibs and frameworks in "Frameworks", and resource files
    in "Resources". But this is not any requirement as such; there are
    apps in the Mac App Store that blatantly "break" this convention.)
    
    Basically, replace uses of gb_PROGRAMDIRNAME and
    gb_Package_PROGRAMDIRNAME with more specific LIBO_FOO_FOLDER, which
    for normal builds all expand to the same "program" anyway.
    
    Change-Id: I16c2b3351caa00e251e229aafbccb8346042d3c1

diff --git a/desktop/Package_branding_custom.mk b/desktop/Package_branding_custom.mk
index e7ceefd..456d545 100644
--- a/desktop/Package_branding_custom.mk
+++ b/desktop/Package_branding_custom.mk
@@ -11,11 +11,11 @@ $(eval $(call gb_Package_Package,desktop_branding_custom,$(CUSTOM_BRAND_DIR)))
 
 $(eval $(call gb_Package_set_outdir,desktop_branding_custom,$(INSTROOT)))
 
-$(eval $(call gb_Package_add_files,desktop_branding_custom,$(gb_PROGRAMDIRNAME),\
+$(eval $(call gb_Package_add_files,desktop_branding_custom,$(LIBO_ETC_FOLDER),\
     $(filter $(BRAND_INTRO_IMAGES),$(CUSTOM_BRAND_IMAGES)) \
 ))
 
-$(eval $(call gb_Package_add_files,desktop_branding_custom,$(gb_PROGRAMDIRNAME)/shell,\
+$(eval $(call gb_Package_add_files,desktop_branding_custom,$(LIBO_ETC_FOLDER)/shell,\
     $(filter-out $(BRAND_INTRO_IMAGES),$(CUSTOM_BRAND_IMAGES)) \
 ))
 
diff --git a/desktop/Package_scripts_install.mk b/desktop/Package_scripts_install.mk
index f164f72..046ba69 100644
--- a/desktop/Package_scripts_install.mk
+++ b/desktop/Package_scripts_install.mk
@@ -13,20 +13,20 @@ $(eval $(call gb_Package_set_outdir,desktop_scripts_install,$(INSTROOT)))
 
 ifeq (,$(filter MACOSX WNT,$(OS)))
 
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/gdbtrace,gdbtrace))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/sbase,sbase.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/scalc,scalc.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/sdraw,sdraw.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/simpress,simpress.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/smath,smath.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/swriter,swriter.sh))
+$(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)/sbase,sbase.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/scalc,scalc.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/sdraw,sdraw.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/simpress,simpress.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/smath,smath.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/swriter,swriter.sh))
 
 endif
 
 ifneq ($(OS),WNT)
 
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/unoinfo,unoinfo.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/unopkg,unopkg.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/unoinfo,unoinfo.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/unopkg,unopkg.sh))
 
 endif
 
diff --git a/desktop/Package_soffice_sh.mk b/desktop/Package_soffice_sh.mk
index 8c5db5b..c0aadbd 100644
--- a/desktop/Package_soffice_sh.mk
+++ b/desktop/Package_soffice_sh.mk
@@ -11,6 +11,6 @@ $(eval $(call gb_Package_Package,desktop_soffice_sh,$(call gb_CustomTarget_get_w
 
 $(eval $(call gb_Package_set_outdir,desktop_soffice_sh,$(INSTROOT)))
 
-$(eval $(call gb_Package_add_file,desktop_soffice_sh,$(gb_PROGRAMDIRNAME)/soffice,soffice.sh))
+$(eval $(call gb_Package_add_file,desktop_soffice_sh,$(LIBO_BIN_FOLDER)/soffice,soffice.sh))
 
 # vim:set noet sw=4 ts=4:
diff --git a/i18npool/CustomTarget_localedata.mk b/i18npool/CustomTarget_localedata.mk
index 37fd9ea..f455fd5 100644
--- a/i18npool/CustomTarget_localedata.mk
+++ b/i18npool/CustomTarget_localedata.mk
@@ -22,7 +22,7 @@ $(call gb_CustomTarget_get_workdir,i18npool/localedata)/localedata_$(1).cxx : \
 	$$(call gb_Output_announce,$$(subst $(WORKDIR)/,,$$@),$(true),SAX,1)
 	$$(call gb_Helper_abbreviate_dirs, \
 		$$(call gb_Helper_execute,saxparser) $(1) $$< $$@.tmp \
-			-env:LO_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT_FOR_BUILD)/$(gb_PROGRAMDIRNAME)) \
+			-env:LO_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT_FOR_BUILD)/$(LIBO_LIB_FOLDER)) \
 			-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_target_for_build,saxparser)) \
 			$(if $(findstring s,$(MAKEFLAGS)),> /dev/null 2>&1) && \
 		sed 's/\(^.*get[^;]*$$$$\)/SAL_DLLPUBLIC_EXPORT \1/' $$@.tmp > $$@ && \
diff --git a/instsetoo_native/Package_setup.mk b/instsetoo_native/Package_setup.mk
index 84807e8..8985f87 100644
--- a/instsetoo_native/Package_setup.mk
+++ b/instsetoo_native/Package_setup.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,instsetoo_native_setup,$(call gb_CustomTarget_g
 
 $(eval $(call gb_Package_set_outdir,instsetoo_native_setup,$(INSTROOT)))
 
-$(eval $(call gb_Package_add_files,instsetoo_native_setup,$(gb_PROGRAMDIRNAME),\
+$(eval $(call gb_Package_add_files,instsetoo_native_setup,$(LIBO_ETC_FOLDER),\
 	$(call gb_Helper_get_rcfile,bootstrap) \
 	$(call gb_Helper_get_rcfile,fundamental) \
 	$(if $(ENABLE_OOENV),ooenv) \
diff --git a/moz/ExternalPackage_runtime.mk b/moz/ExternalPackage_runtime.mk
index 04b2486..ca1cb11 100644
--- a/moz/ExternalPackage_runtime.mk
+++ b/moz/ExternalPackage_runtime.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,moz_runtime,mozruntime))
 
 $(eval $(call gb_ExternalPackage_set_outdir,moz_runtime,$(INSTROOT)))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files_with_dir,moz_runtime,$(gb_Package_PROGRAMDIRNAME),\
+$(eval $(call gb_ExternalPackage_add_unpacked_files_with_dir,moz_runtime,$(LIBO_BIN_FOLDER),\
 	components/addrbook.dll \
 	components/addrbook.xpt \
 	components/i18n.dll \
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index c97bf41..4eb72ac 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_UnoApi_UnoApi,offapi,offapi))
 
-$(eval $(call gb_UnoApi_install,offapi,$(gb_PROGRAMDIRNAME)/types/offapi.rdb))
+$(eval $(call gb_UnoApi_install,offapi,$(LIBO_ETC_FOLDER)/types/offapi.rdb))
 
 $(eval $(call gb_UnoApi_package_idlfiles,offapi))
 
diff --git a/oovbaapi/UnoApi_oovbaapi.mk b/oovbaapi/UnoApi_oovbaapi.mk
index e545cbc3..a80fb88 100644
--- a/oovbaapi/UnoApi_oovbaapi.mk
+++ b/oovbaapi/UnoApi_oovbaapi.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_UnoApi_UnoApi,oovbaapi,oovbaapi))
 
-$(eval $(call gb_UnoApi_install,oovbaapi,$(gb_PROGRAMDIRNAME)/types/oovbaapi.rdb))
+$(eval $(call gb_UnoApi_install,oovbaapi,$(LIBO_ETC_FOLDER)/types/oovbaapi.rdb))
 
 $(eval $(call gb_UnoApi_use_api,oovbaapi,\
     udkapi \
diff --git a/padmin/Package_padmin.mk b/padmin/Package_padmin.mk
index 5f96e18..1765776 100644
--- a/padmin/Package_padmin.mk
+++ b/padmin/Package_padmin.mk
@@ -21,6 +21,6 @@ $(eval $(call gb_Package_Package,padmin,$(SRCDIR)/padmin/source))
 
 $(eval $(call gb_Package_set_outdir,padmin,$(INSTROOT)))
 
-$(eval $(call gb_Package_add_file,padmin,$(gb_PROGRAMDIRNAME)/spadmin,spadmin.sh))
+$(eval $(call gb_Package_add_file,padmin,$(LIBO_BIN_FOLDER)/spadmin,spadmin.sh))
 
 # vim: set noet sw=4 ts=4:
diff --git a/python3/ExternalPackage_python3.mk b/python3/ExternalPackage_python3.mk
index 9448e25..a661ff7 100644
--- a/python3/ExternalPackage_python3.mk
+++ b/python3/ExternalPackage_python3.mk
@@ -17,12 +17,12 @@ ifeq ($(OS)-$(COM),WNT-MSC)
 ifeq ($(CPUNAME),X86_64)
 python_arch_subdir=amd64/
 endif
-$(eval $(call gb_ExternalPackage_add_file,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/bin/python.exe,LO_lib/$(python_arch_subdir)python$(if $(MSVC_USE_DEBUG_RUNTIME),_d).exe))
-$(eval $(call gb_ExternalPackage_add_file,python3,$(gb_Package_PROGRAMDIRNAME)/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).dll,LO_lib/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).dll))
+$(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/bin/python.exe,LO_lib/$(python_arch_subdir)python$(if $(MSVC_USE_DEBUG_RUNTIME),_d).exe))
+$(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).dll,LO_lib/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).dll))
 ifeq ($(MSVC_USE_DEBUG_RUNTIME),)
-$(eval $(call gb_ExternalPackage_add_file,python3,$(gb_Package_PROGRAMDIRNAME)/python$(PYTHON_VERSION_MAJOR).dll,LO_lib/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR).dll))
+$(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python$(PYTHON_VERSION_MAJOR).dll,LO_lib/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR).dll))
 endif
-$(eval $(call gb_ExternalPackage_add_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib,\
+$(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\
 	LO_lib/$(python_arch_subdir)_ctypes$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
 	LO_lib/$(python_arch_subdir)_ctypes_test$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
 	LO_lib/$(python_arch_subdir)_decimal$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
@@ -40,13 +40,13 @@ $(eval $(call gb_ExternalPackage_add_files,python3,$(gb_Package_PROGRAMDIRNAME)/
 ))
 else ifeq ($(OS),WNT) # MinGW
 # TODO how are C modules called on this platform?
-$(eval $(call gb_ExternalPackage_add_file,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/bin/python.exe,python.exe))
-$(eval $(call gb_ExternalPackage_add_file,python3,$(gb_Package_PROGRAMDIRNAME)/python$(PYTHON_VERSION_MAJOR).dll,python$(PYTHON_VERSION_MAJOR).dll))
+$(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/bin/python.exe,python.exe))
+$(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python$(PYTHON_VERSION_MAJOR).dll,python$(PYTHON_VERSION_MAJOR).dll))
 else
-$(eval $(call gb_ExternalPackage_add_file,python3,$(gb_Package_PROGRAMDIRNAME)/python.bin,python))
-$(eval $(call gb_ExternalPackage_add_file,python3,$(gb_Package_PROGRAMDIRNAME)/libpython$(PYTHON_VERSION_MAJOR).so,libpython$(PYTHON_VERSION_MAJOR).so))
-$(eval $(call gb_ExternalPackage_add_file,python3,$(gb_Package_PROGRAMDIRNAME)/libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so,libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so))
-$(eval $(call gb_ExternalPackage_add_file,python3,$(gb_Package_PROGRAMDIRNAME)/libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so-gdb.py,Tools/gdb/libpython.py))
+$(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python.bin,python))
+$(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/libpython$(PYTHON_VERSION_MAJOR).so,libpython$(PYTHON_VERSION_MAJOR).so))
+$(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so,libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so))
+$(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so-gdb.py,Tools/gdb/libpython.py))
 # versioned lib/libpython3.3m.so.1.0 appears to be unnecessary?
 
 # Unfortunately the python build system does not allow to explicitly enable or
@@ -56,7 +56,7 @@ $(eval $(call gb_ExternalPackage_add_file,python3,$(gb_Package_PROGRAMDIRNAME)/l
 # Obviously this list should not contain stuff with external dependencies
 # that may not be available on baseline systems.
 ifneq ($(OS),AIX)
-$(eval $(call gb_ExternalPackage_add_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/lib-dynload,\
+$(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/lib-dynload,\
 	LO_lib/array.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
 	LO_lib/atexit.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
 	LO_lib/audioop.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
@@ -123,7 +123,7 @@ endif
 # test - probably unnecessary? was explicitly removed #i116738#
 # venv - why would we need virtual environments
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/plat-linux,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/plat-linux,\
 	Lib/plat-linux/regen \
 	Lib/plat-linux/CDROM.py \
 	Lib/plat-linux/DLFCN.py \
@@ -131,12 +131,12 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAM
 	Lib/plat-linux/TYPES.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/plat-darwin,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/plat-darwin,\
 	Lib/plat-darwin/IN.py \
 	Lib/plat-darwin/regen \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/plat-sunos5,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/plat-sunos5,\
 	Lib/plat-sunos5/regen \
 	Lib/plat-sunos5/CDIO.py \
 	Lib/plat-sunos5/DLFCN.py \
@@ -145,19 +145,19 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAM
 	Lib/plat-sunos5/TYPES.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/plat-aix4,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/plat-aix4,\
 	Lib/plat-aix4/regen \
 	Lib/plat-aix4/IN.py \
 ))
 
 # that one is generated...
 ifneq ($(OS)-$(COM),WNT-MSC)
-$(eval $(call gb_ExternalPackage_add_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib,\
+$(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\
 	Lib/_sysconfigdata.py \
 ))
 endif
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\
 	LICENSE \
 	Lib/__future__.py \
 	Lib/__phello__.foo.py \
@@ -316,31 +316,31 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAM
 	Lib/zipfile.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/collections,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/collections,\
 	Lib/collections/__init__.py \
 	Lib/collections/__main__.py \
 	Lib/collections/abc.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/concurrent,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/concurrent,\
 	Lib/concurrent/__init__.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/concurrent/futures,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/concurrent/futures,\
 	Lib/concurrent/futures/__init__.py \
 	Lib/concurrent/futures/_base.py \
 	Lib/concurrent/futures/process.py \
 	Lib/concurrent/futures/thread.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/ctypes,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/ctypes,\
 	Lib/ctypes/__init__.py \
 	Lib/ctypes/_endian.py \
 	Lib/ctypes/util.py \
 	Lib/ctypes/wintypes.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/ctypes/macholib,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/ctypes/macholib,\
 	Lib/ctypes/macholib/README.ctypes \
 	Lib/ctypes/macholib/fetch_macholib \
 	Lib/ctypes/macholib/fetch_macholib.bat \
@@ -350,7 +350,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAM
 	Lib/ctypes/macholib/framework.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/distutils,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/distutils,\
 	Lib/distutils/README \
 	Lib/distutils/__init__.py \
 	Lib/distutils/archive_util.py \
@@ -382,7 +382,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAM
 	Lib/distutils/version.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/distutils/command,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/distutils/command,\
 	Lib/distutils/command/__init__.py \
 	Lib/distutils/command/bdist_dumb.py \
 	Lib/distutils/command/bdist_msi.py \
@@ -415,7 +415,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAM
 	Lib/distutils/command/wininst-9.0.exe \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/email,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/email,\
 	Lib/email/__init__.py \
 	Lib/email/_encoded_words.py \
 	Lib/email/_header_value_parser.py \
@@ -438,7 +438,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAM
 	Lib/email/utils.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/email/mime,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/email/mime,\
 	Lib/email/mime/__init__.py \
 	Lib/email/mime/application.py \
 	Lib/email/mime/audio.py \
@@ -450,7 +450,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAM
 	Lib/email/mime/text.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/encodings,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/encodings,\
 	Lib/encodings/__init__.py \
 	Lib/encodings/aliases.py \
 	Lib/encodings/ascii.py \
@@ -573,13 +573,13 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAM
 	Lib/encodings/zlib_codec.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/html,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/html,\
 	Lib/html/__init__.py \
 	Lib/html/entities.py \
 	Lib/html/parser.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/http,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/http,\
 	Lib/http/__init__.py \
 	Lib/http/client.py \
 	Lib/http/cookiejar.py \
@@ -587,7 +587,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAM
 	Lib/http/server.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/importlib,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/importlib,\
 	Lib/importlib/__init__.py \
 	Lib/importlib/_bootstrap.py \
 	Lib/importlib/abc.py \
@@ -595,7 +595,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAM
 	Lib/importlib/util.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/json,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/json,\
 	Lib/json/__init__.py \
 	Lib/json/decoder.py \
 	Lib/json/encoder.py \
@@ -603,7 +603,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAM
 	Lib/json/tool.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/lib2to3,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/lib2to3,\
 	Lib/lib2to3/Grammar.txt \
 	Lib/lib2to3/PatternGrammar.txt \
 	Lib/lib2to3/__init__.py \
@@ -619,7 +619,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAM
 	Lib/lib2to3/refactor.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/lib2to3/fixes,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/lib2to3/fixes,\
 	Lib/lib2to3/fixes/__init__.py \
 	Lib/lib2to3/fixes/fix_apply.py \
 	Lib/lib2to3/fixes/fix_basestring.py \
@@ -674,7 +674,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAM
 	Lib/lib2to3/fixes/fix_zip.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/pgen2,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/pgen2,\
 	Lib/lib2to3/pgen2/__init__.py \
 	Lib/lib2to3/pgen2/conv.py \
 	Lib/lib2to3/pgen2/driver.py \
@@ -686,13 +686,13 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAM
 	Lib/lib2to3/pgen2/token.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/logging,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/logging,\
 	Lib/logging/__init__.py \
 	Lib/logging/config.py \
 	Lib/logging/handlers.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/multiprocessing,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/multiprocessing,\
 	Lib/multiprocessing/__init__.py \
 	Lib/multiprocessing/connection.py \
 	Lib/multiprocessing/forking.py \
@@ -707,18 +707,18 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAM
 	Lib/multiprocessing/util.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/multiprocessing/dummy,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/multiprocessing/dummy,\
 	Lib/multiprocessing/dummy/__init__.py \
 	Lib/multiprocessing/dummy/connection.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/pydoc_data,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/pydoc_data,\
 	Lib/pydoc_data/__init__.py \
 	Lib/pydoc_data/_pydoc.css \
 	Lib/pydoc_data/topics.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/unittest,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/unittest,\
 	Lib/unittest/__init__.py \
 	Lib/unittest/__main__.py \
 	Lib/unittest/case.py \
@@ -732,7 +732,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAM
 	Lib/unittest/util.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/unittest/test,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/unittest/test,\
 	Lib/unittest/test/__init__.py \
 	Lib/unittest/test/dummy.py \
 	Lib/unittest/test/support.py \
@@ -751,7 +751,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAM
 	Lib/unittest/test/_test_warnings.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/unittest/test/testmock,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/unittest/test/testmock,\
 	Lib/unittest/test/testmock/__init__.py \
 	Lib/unittest/test/testmock/support.py \
 	Lib/unittest/test/testmock/testcallable.py \
@@ -763,7 +763,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAM
 	Lib/unittest/test/testmock/testwith.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/urllib,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/urllib,\
 	Lib/urllib/__init__.py \
 	Lib/urllib/error.py \
 	Lib/urllib/parse.py \
@@ -772,7 +772,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAM
 	Lib/urllib/robotparser.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/wsgiref,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/wsgiref,\
 	Lib/wsgiref/__init__.py \
 	Lib/wsgiref/handlers.py \
 	Lib/wsgiref/headers.py \
@@ -781,11 +781,11 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAM
 	Lib/wsgiref/validate.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/xml,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/xml,\
 	Lib/xml/__init__.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/xml/dom,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/xml/dom,\
 	Lib/xml/dom/__init__.py \
 	Lib/xml/dom/NodeFilter.py \
 	Lib/xml/dom/domreg.py \
@@ -796,7 +796,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAM
 	Lib/xml/dom/xmlbuilder.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/xml/etree,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/xml/etree,\
 	Lib/xml/etree/__init__.py \
 	Lib/xml/etree/ElementInclude.py \
 	Lib/xml/etree/ElementPath.py \
@@ -804,12 +804,12 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAM
 	Lib/xml/etree/cElementTree.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/xml/parsers,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/xml/parsers,\
 	Lib/xml/parsers/__init__.py \
 	Lib/xml/parsers/expat.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/xml/sax,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/xml/sax,\
 	Lib/xml/sax/__init__.py \
 	Lib/xml/sax/_exceptions.py \
 	Lib/xml/sax/expatreader.py \
@@ -818,13 +818,13 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAM
 	Lib/xml/sax/xmlreader.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/xmlrpc,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/xmlrpc,\
 	Lib/xmlrpc/__init__.py \
 	Lib/xmlrpc/client.py \
 	Lib/xmlrpc/server.py \
 ))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/site-packages,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/site-packages,\
 	Lib/site-packages/README \
 ))
 
diff --git a/python3/GeneratedPackage_python3.mk b/python3/GeneratedPackage_python3.mk
index d8854eb..8ca47a9 100644
--- a/python3/GeneratedPackage_python3.mk
+++ b/python3/GeneratedPackage_python3.mk
@@ -13,6 +13,6 @@ $(eval $(call gb_GeneratedPackage_use_unpacked,python3,python3))
 
 $(eval $(call gb_GeneratedPackage_use_external_project,python3,python3))
 
-$(eval $(call gb_GeneratedPackage_add_dir,python3,$(INSTROOT)/$(if $(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE),Frameworks,$(gb_Package_PROGRAMDIRNAME))/LibreOfficePython.framework,LibreOfficePython.framework))
+$(eval $(call gb_GeneratedPackage_add_dir,python3,$(INSTROOT)/$(if $(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE),Frameworks,$(LIBO_BIN_FOLDER))/LibreOfficePython.framework,LibreOfficePython.framework))
 
 # vim: set noet sw=4 ts=4:
diff --git a/pyuno/Package_python_shell.mk b/pyuno/Package_python_shell.mk
index a986d72..3f14841 100644
--- a/pyuno/Package_python_shell.mk
+++ b/pyuno/Package_python_shell.mk
@@ -11,6 +11,6 @@ $(eval $(call gb_Package_Package,python_shell,$(call gb_CustomTarget_get_workdir
 
 $(eval $(call gb_Package_set_outdir,python_shell,$(INSTROOT)))
 
-$(eval $(call gb_Package_add_file,python_shell,$(gb_Package_PROGRAMDIRNAME)/python,python.sh))
+$(eval $(call gb_Package_add_file,python_shell,$(LIBO_BIN_FOLDER)/python,python.sh))
 
 # vim: set noet sw=4 ts=4:
diff --git a/shell/Package_scripts.mk b/shell/Package_scripts.mk
index a2af651..64e4fe3 100644
--- a/shell/Package_scripts.mk
+++ b/shell/Package_scripts.mk
@@ -11,10 +11,10 @@ $(eval $(call gb_Package_Package,shell_scripts,$(SRCDIR)/shell/source/unix/misc)
 
 $(eval $(call gb_Package_set_outdir,shell_scripts,$(INSTROOT)))
 
-$(eval $(call gb_Package_add_file,shell_scripts,$(gb_PROGRAMDIRNAME)/open-url,open-url.sh))
+$(eval $(call gb_Package_add_file,shell_scripts,$(LIBO_BIN_FOLDER)/open-url,open-url.sh))
 
 ifeq ($(ENABLE_TDE),TRUE)
-$(eval $(call gb_Package_add_file,shell_scripts,$(gb_PROGRAMDIRNAME)/tde-open-url,tde-open-url.sh))
+$(eval $(call gb_Package_add_file,shell_scripts,$(LIBO_BIN_FOLDER)/tde-open-url,tde-open-url.sh))
 endif
 
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/Package_scripts_gnome.mk b/shell/Package_scripts_gnome.mk
index 15c3015..311f2c9 100644
--- a/shell/Package_scripts_gnome.mk
+++ b/shell/Package_scripts_gnome.mk
@@ -11,6 +11,6 @@ $(eval $(call gb_Package_Package,shell_scripts_gnome,$(SRCDIR)/shell/source/unix
 
 $(eval $(call gb_Package_set_outdir,shell_scripts_gnome,$(INSTROOT)))
 
-$(eval $(call gb_Package_add_file,shell_scripts_gnome,$(gb_PROGRAMDIRNAME)/gnome-open-url,gnome-open-url.sh))
+$(eval $(call gb_Package_add_file,shell_scripts_gnome,$(LIBO_BIN_FOLDER)/gnome-open-url,gnome-open-url.sh))
 
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/Package_scripts_kde.mk b/shell/Package_scripts_kde.mk
index c262ffa..c534963 100644
--- a/shell/Package_scripts_kde.mk
+++ b/shell/Package_scripts_kde.mk
@@ -11,6 +11,6 @@ $(eval $(call gb_Package_Package,shell_scripts_kde,$(SRCDIR)/shell/source/unix/m
 
 $(eval $(call gb_Package_set_outdir,shell_scripts_kde,$(INSTROOT)))
 
-$(eval $(call gb_Package_add_file,shell_scripts_kde,$(gb_PROGRAMDIRNAME)/kde-open-url,kde-open-url.sh))
+$(eval $(call gb_Package_add_file,shell_scripts_kde,$(LIBO_BIN_FOLDER)/kde-open-url,kde-open-url.sh))
 
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/Package_senddoc.mk b/shell/Package_senddoc.mk
index be498e7..455d2b3 100644
--- a/shell/Package_senddoc.mk
+++ b/shell/Package_senddoc.mk
@@ -11,6 +11,6 @@ $(eval $(call gb_Package_Package,shell_senddoc,$(SRCDIR)/shell/source/unix/misc)
 
 $(eval $(call gb_Package_set_outdir,shell_senddoc,$(INSTROOT)))
 
-$(eval $(call gb_Package_add_file,shell_senddoc,$(gb_PROGRAMDIRNAME)/senddoc,senddoc.sh))
+$(eval $(call gb_Package_add_file,shell_senddoc,$(LIBO_BIN_FOLDER)/senddoc,senddoc.sh))
 
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index d11b5d9..a38d879 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -458,7 +458,7 @@ $(call gb_AllLangResTarget_get_target,%) :
 	$(call gb_Helper_abbreviate_dirs,\
 		mkdir -p $(dir $@) && touch $@)
 
-gb_ResTarget_get_install_target = $(INSTROOT)/$(gb_PROGRAMDIRNAME)/resource/$(1).res
+gb_ResTarget_get_install_target = $(INSTROOT)/$(LIBO_SHARE_RESOURCE_FOLDER)/$(1).res
 
 define gb_AllLangResTarget_AllLangResTarget
 $(foreach lang,$(gb_AllLangResTarget_LANGS),\
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 154841f..d205e00 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -60,7 +60,7 @@ $(if $(URE),\
     $(if $(strip $(UNO_SERVICES)),\
 	"-env:UNO_SERVICES=$(foreach item,$(UNO_SERVICES),$(call gb_Helper_make_url,$(item)))") \
 	-env:URE_INTERNAL_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT)/$(LIBO_URE_LIB_FOLDER)) \
-	-env:LO_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT)/$(gb_PROGRAMDIRNAME)) \
+	-env:LO_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT)/$(LIBO_LIB_FOLDER)) \
 	-env:LO_JAVA_DIR=$(call gb_Helper_make_url,$(INSTROOT)/$(LIBO_SHARE_JAVA_FOLDER)) \
 	--protector $(call gb_Library_get_target,unoexceptionprotector) unoexceptionprotector \
 	--protector $(call gb_Library_get_target,unobootstrapprotector) unobootstrapprotector \
diff --git a/solenv/gbuild/ExternalPackage.mk b/solenv/gbuild/ExternalPackage.mk
index 5eb5231..c1ff3fb 100644
--- a/solenv/gbuild/ExternalPackage.mk
+++ b/solenv/gbuild/ExternalPackage.mk
@@ -218,7 +218,7 @@ endef
 #
 # gb_ExternalPackage_add_library_for_install package dest src library?
 define gb_ExternalPackage_add_library_for_install
-$(call gb_ExternalPackage__add_file_for_install,$(1),$(2),$(if $(4),$(call gb_Library_get_instdir,$(4)),$(INSTROOT)/$(gb_Package_PROGRAMDIRNAME))/$(notdir $(2)),$(3))
+$(call gb_ExternalPackage__add_file_for_install,$(1),$(2),$(if $(4),$(call gb_Library_get_instdir,$(4)),$(INSTROOT)/$(LIBO_LIB_FOLDER))/$(notdir $(2)),$(3))
 
 endef
 
@@ -238,7 +238,7 @@ endef
 #
 # gb_ExternalPackage_add_jar_for_install package dest src
 define gb_ExternalPackage_add_jar_for_install
-$(call gb_ExternalPackage__add_file_for_install,$(1),$(2),$(INSTROOT)/$(gb_Package_PROGRAMDIRNAME)/classes/$(notdir $(2)),$(3))
+$(call gb_ExternalPackage__add_file_for_install,$(1),$(2),$(INSTROOT)/$(LIBO_SHARE_JAVA_FOLDER)/$(notdir $(2)),$(3))
 
 endef
 
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index 0feab81..e4201cf 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -54,7 +54,7 @@ define gb_Gallery__make_env_args
 "-env:UNO_TYPES=$(foreach item,$(gb_Gallery__UNO_TYPES),\
 	$(call gb_Helper_make_url,$(call gb_UnoApi_get_target,$(item))))" \
 -env:URE_INTERNAL_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT)/$(LIBO_URE_LIB_FOLDER)) \
--env:LO_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT)/$(gb_PROGRAMDIRNAME))
+-env:LO_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT)/$(LIBO_LIB_FOLDER))
 endef
 
 define gb_Gallery__command
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 488f988..5febb97 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -31,8 +31,8 @@
 
 gb_Library_LAYER_DIRS := \
 	URELIB:$(INSTROOT)/$(LIBO_URE_LIB_FOLDER) \
-	OOO:$(INSTROOT)/$(gb_PROGRAMDIRNAME) \
-	SHLXTHDL:$(INSTROOT)/$(gb_PROGRAMDIRNAME)/shlxthdl \
+	OOO:$(INSTROOT)/$(LIBO_LIB_FOLDER) \
+	SHLXTHDL:$(INSTROOT)/$(LIBO_LIB_FOLDER)/shlxthdl \
 	OXT:$(WORKDIR)/LinkTarget/ExtensionLibrary \
 	NONE:$(gb_Library_DLLDIR) \
 
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index ed0f3ba..8507537 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -63,8 +63,6 @@ endef
 
 # Package class
 
-gb_Package_PROGRAMDIRNAME := $(LIBO_BIN_FOLDER)
-
 $(dir $(call gb_Package_get_target,%)).dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
diff --git a/solenv/gbuild/Pagein.mk b/solenv/gbuild/Pagein.mk
index 93e218b..2c20e29 100644
--- a/solenv/gbuild/Pagein.mk
+++ b/solenv/gbuild/Pagein.mk
@@ -18,7 +18,7 @@ gb_Pagein__make_library_path = $(call gb_Pagein__get_libdir,$(1))$(call gb_Libra
 gb_Pagein__make_path = \
 $(if $(call gb_Pagein__is_library,$(1)),$(call gb_Pagein__make_library_path,$(1)),$(1))
 
-gb_Pagein__get_install_target = $(INSTROOT)/$(gb_PROGRAMDIRNAME)/pagein-$(1)
+gb_Pagein__get_install_target = $(INSTROOT)/$(LIBO_BIN_FOLDER)/pagein-$(1)
 
 define gb_Pagein__command
 $(call gb_Output_announce,$(2),$(true),PAG,5)
diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk
index 3a39897..9ec2d0f 100644
--- a/solenv/gbuild/Rdb.mk
+++ b/solenv/gbuild/Rdb.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-gb_Rdb__get_install_target = $(INSTROOT)/$(gb_PROGRAMDIRNAME)/services/$(1).rdb
+gb_Rdb__get_install_target = $(INSTROOT)/$(LIBO_ETC_FOLDER)/services/$(1).rdb
 
 define gb_Rdb__command
 $(call gb_Helper_abbreviate_dirs,\
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index ccf056c..23a2431 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -181,8 +181,6 @@ $(eval $(call gb_Helper_collect_knownlibs))
 
 gb_Library_DLLPOSTFIX := lo
 
-gb_PROGRAMDIRNAME := $(LIBO_BIN_FOLDER)
-
 # Include platform/cpu/compiler specific config/definitions
 include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk
 
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index 16d7de5..e4ff2bb 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -305,6 +305,6 @@ gb_LTOFLAGS := $(if $(filter TRUE,$(ENABLE_LTO)),-GL)
 gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin
 
 # need windows path with backslashes here
-gb_Helper_set_ld_path := PATH="$(shell cygpath -w $(OUTDIR)/bin);$(shell cygpath -w $(INSTDIR)/$(LIBO_URE_LIB_FOLDER));$(shell cygpath -w $(INSTDIR)/$(gb_PROGRAMDIRNAME))"
+gb_Helper_set_ld_path := PATH="$(shell cygpath -w $(OUTDIR)/bin);$(shell cygpath -w $(INSTDIR)/$(LIBO_URE_LIB_FOLDER));$(shell cygpath -w $(INSTDIR)/$(LIBO_BIN_FOLDER))"
 
 # vim: set noet sw=4:
commit aa26a065867c36a412193db9854cf2ca97154dde
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Sep 25 20:33:08 2013 +0200

    We don't want the sbase etc scripts on OS X
    
    Change-Id: If9748185c004b2368401373a38db92d6b61373cb

diff --git a/desktop/Package_scripts.mk b/desktop/Package_scripts.mk
index f47fc8c..5171cb8 100644
--- a/desktop/Package_scripts.mk
+++ b/desktop/Package_scripts.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,desktop_scripts,$(SRCDIR)/desktop/scripts))
 
-ifneq ($(OS),WNT)
+ifeq (,$(filter MACOSX WNT,$(OS)))
 
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/gdbtrace,gdbtrace))
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/sbase,sbase.sh))
@@ -18,6 +18,11 @@ $(eval $(call gb_Package_add_file,desktop_scripts,bin/sdraw,sdraw.sh))
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/simpress,simpress.sh))
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/smath,smath.sh))
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/swriter,swriter.sh))
+
+endif
+
+ifneq ($(OS),WNT)
+
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/unoinfo,unoinfo.sh))
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/unopkg,unopkg.sh))
 
diff --git a/desktop/Package_scripts_install.mk b/desktop/Package_scripts_install.mk
index a320207..f164f72 100644
--- a/desktop/Package_scripts_install.mk
+++ b/desktop/Package_scripts_install.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,desktop_scripts_install,$(SRCDIR)/desktop/scrip
 
 $(eval $(call gb_Package_set_outdir,desktop_scripts_install,$(INSTROOT)))
 
-ifneq ($(OS),WNT)
+ifeq (,$(filter MACOSX WNT,$(OS)))
 
 $(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/gdbtrace,gdbtrace))
 $(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/sbase,sbase.sh))
@@ -20,6 +20,11 @@ $(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/s
 $(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/simpress,simpress.sh))
 $(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/smath,smath.sh))
 $(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/swriter,swriter.sh))
+
+endif
+
+ifneq ($(OS),WNT)
+
 $(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/unoinfo,unoinfo.sh))
 $(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/unopkg,unopkg.sh))

More information about the Libreoffice-commits mailing list