summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--desktop/Package_branding.mk4
-rw-r--r--desktop/Package_branding_custom.mk4
-rw-r--r--desktop/Package_pagein_install.mk2
-rw-r--r--desktop/Package_scripts_install.mk18
-rw-r--r--instsetoo_native/Package_config.mk2
-rw-r--r--instsetoo_native/Package_rdb.mk4
-rw-r--r--instsetoo_native/Package_setup.mk2
-rw-r--r--padmin/Package_padmin.mk2
-rw-r--r--pyuno/Package_python_scripts_install.mk2
-rw-r--r--scripting/Package_scriptproviderforpython.mk4
-rw-r--r--shell/Package_scripts.mk6
-rw-r--r--shell/Package_scripts_gnome.mk2
-rw-r--r--shell/Package_scripts_kde.mk2
-rw-r--r--shell/Package_senddoc.mk2
-rw-r--r--solenv/Package_gdb_install.mk2
-rw-r--r--solenv/gbuild/Pyuno.mk5
-rw-r--r--solenv/gbuild/platform/IOS_ARM_GCC.mk6
-rw-r--r--solenv/gbuild/platform/WNT_INTEL_GCC.mk6
-rw-r--r--solenv/gbuild/platform/com_MSC_class.mk6
-rw-r--r--solenv/gbuild/platform/macosx.mk6
-rw-r--r--solenv/gbuild/platform/solaris.mk6
-rw-r--r--solenv/gbuild/platform/unxgcc.mk6
22 files changed, 42 insertions, 57 deletions
diff --git a/desktop/Package_branding.mk b/desktop/Package_branding.mk
index 25909e85c7fe..f981708c95e9 100644
--- a/desktop/Package_branding.mk
+++ b/desktop/Package_branding.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,desktop_branding,$(SRCDIR)/icon-themes/galaxy))
$(eval $(call gb_Package_set_outdir,desktop_branding,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,desktop_branding,$(gb_Pyuno_PROGRAMDIRNAME),\
+$(eval $(call gb_Package_add_files,desktop_branding,$(gb_PROGRAMDIRNAME),\
$(foreach image,$(filter $(BRAND_INTRO_IMAGES),$(DEFAULT_BRAND_IMAGES)),\
$(if $(filter intro.png,$(image)),\
$(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),brand,brand_dev)/$(image),\
@@ -20,7 +20,7 @@ $(eval $(call gb_Package_add_files,desktop_branding,$(gb_Pyuno_PROGRAMDIRNAME),\
) \
))
-$(eval $(call gb_Package_add_files,desktop_branding,$(gb_Pyuno_PROGRAMDIRNAME)/shell,\
+$(eval $(call gb_Package_add_files,desktop_branding,$(gb_PROGRAMDIRNAME)/shell,\
$(addprefix brand/shell/,$(filter-out $(BRAND_INTRO_IMAGES),$(DEFAULT_BRAND_IMAGES))) \
))
diff --git a/desktop/Package_branding_custom.mk b/desktop/Package_branding_custom.mk
index 449a4299154f..5713d3f8b367 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,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,desktop_branding_custom,$(gb_Pyuno_PROGRAMDIRNAME),\
+$(eval $(call gb_Package_add_files,desktop_branding_custom,$(gb_PROGRAMDIRNAME),\
$(filter $(BRAND_INTRO_IMAGES),$(CUSTOM_BRAND_IMAGES)) \
))
-$(eval $(call gb_Package_add_files,desktop_branding_custom,$(gb_Pyuno_PROGRAMDIRNAME)/shell,\
+$(eval $(call gb_Package_add_files,desktop_branding_custom,$(gb_PROGRAMDIRNAME)/shell,\
$(filter-out $(BRAND_INTRO_IMAGES),$(CUSTOM_BRAND_IMAGES)) \
))
diff --git a/desktop/Package_pagein_install.mk b/desktop/Package_pagein_install.mk
index 2ef1972eef92..8a494274fb44 100644
--- a/desktop/Package_pagein_install.mk
+++ b/desktop/Package_pagein_install.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,desktop_pagein_install,$(OUTDIR)/bin))
$(eval $(call gb_Package_set_outdir,desktop_pagein_install,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,desktop_pagein_install,$(gb_Pyuno_PROGRAMDIRNAME),\
+$(eval $(call gb_Package_add_files,desktop_pagein_install,$(gb_PROGRAMDIRNAME),\
pagein-calc \
pagein-common \
pagein-draw \
diff --git a/desktop/Package_scripts_install.mk b/desktop/Package_scripts_install.mk
index f54cc9e904be..3c7fbcb924e1 100644
--- a/desktop/Package_scripts_install.mk
+++ b/desktop/Package_scripts_install.mk
@@ -17,15 +17,15 @@ $(eval $(call gb_Package_add_file,desktop_scripts_install,bin/ure-link,ure-link)
else
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_Pyuno_PROGRAMDIRNAME)/gdbtrace,gdbtrace))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_Pyuno_PROGRAMDIRNAME)/sbase,sbase.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_Pyuno_PROGRAMDIRNAME)/scalc,scalc.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_Pyuno_PROGRAMDIRNAME)/sdraw,sdraw.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_Pyuno_PROGRAMDIRNAME)/simpress,simpress.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_Pyuno_PROGRAMDIRNAME)/smath,smath.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_Pyuno_PROGRAMDIRNAME)/swriter,swriter.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_Pyuno_PROGRAMDIRNAME)/unoinfo,unoinfo.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_Pyuno_PROGRAMDIRNAME)/unopkg,unopkg.sh))
+$(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,$(gb_PROGRAMDIRNAME)/unoinfo,unoinfo.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/unopkg,unopkg.sh))
endif
diff --git a/instsetoo_native/Package_config.mk b/instsetoo_native/Package_config.mk
index 01c708b8ef54..128b653a78b1 100644
--- a/instsetoo_native/Package_config.mk
+++ b/instsetoo_native/Package_config.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,instsetoo_native_config,$(SRCDIR)/instsetoo_nat
$(eval $(call gb_Package_set_outdir,instsetoo_native_config,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,instsetoo_native_config,program,\
+$(eval $(call gb_Package_add_files,instsetoo_native_config,$(gb_PROGRAMDIRNAME),\
bootstraprc \
fundamentalrc \
unorc \
diff --git a/instsetoo_native/Package_rdb.mk b/instsetoo_native/Package_rdb.mk
index 9e28f068f6d8..6bbfd3b1dc28 100644
--- a/instsetoo_native/Package_rdb.mk
+++ b/instsetoo_native/Package_rdb.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,instsetoo_native_rdb,$(OUTDIR)))
$(eval $(call gb_Package_set_outdir,instsetoo_native_rdb,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,instsetoo_native_rdb,program/services,\
+$(eval $(call gb_Package_add_files,instsetoo_native_rdb,$(gb_PROGRAMDIRNAME)/services,\
xml/services.rdb \
$(call gb_Helper_optional,POSTGRESQL,$(if $(filter YES,$(BUILD_POSTGRESQL_SDBC)),xml/postgresql-sdbc.rdb)) \
$(if $(filter TRUE,$(DISABLE_SCRIPTING)),,\
@@ -22,7 +22,7 @@ $(eval $(call gb_Package_add_files,instsetoo_native_rdb,program/services,\
) \
))
-$(eval $(call gb_Package_add_files,instsetoo_native_rdb,program/types,\
+$(eval $(call gb_Package_add_files,instsetoo_native_rdb,$(gb_PROGRAMDIRNAME)/types,\
bin/offapi.rdb \
bin/oovbaapi.rdb \
))
diff --git a/instsetoo_native/Package_setup.mk b/instsetoo_native/Package_setup.mk
index aaba1e51963d..b2a2c9908773 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,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,instsetoo_native_setup,program,\
+$(eval $(call gb_Package_add_files,instsetoo_native_setup,$(gb_PROGRAMDIRNAME),\
ooenv \
$(if $(filter TRUE,$(DISABLE_PYTHON)),,pythonloader.unorc) \
versionrc \
diff --git a/padmin/Package_padmin.mk b/padmin/Package_padmin.mk
index 7a9dde1e7de5..6787c2c497d6 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,$(INSTDIR)))
-$(eval $(call gb_Package_add_file,padmin,program/spadmin,spadmin.sh))
+$(eval $(call gb_Package_add_file,padmin,$(gb_PROGRAMDIRNAME)/spadmin,spadmin.sh))
# vim: set noet sw=4 ts=4:
diff --git a/pyuno/Package_python_scripts_install.mk b/pyuno/Package_python_scripts_install.mk
index dc2f08e3fe45..49df61503a11 100644
--- a/pyuno/Package_python_scripts_install.mk
+++ b/pyuno/Package_python_scripts_install.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,pyuno_python_scripts_install,$(SRCDIR)/pyuno/so
$(eval $(call gb_Package_set_outdir,pyuno_python_scripts_install,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,pyuno_python_scripts_install,program,\
+$(eval $(call gb_Package_add_files,pyuno_python_scripts_install,$(gb_PROGRAMDIRNAME),\
loader/pythonloader.py \
module/uno.py \
module/unohelper.py \
diff --git a/scripting/Package_scriptproviderforpython.mk b/scripting/Package_scriptproviderforpython.mk
index 29830a06ba40..afe0e1232172 100644
--- a/scripting/Package_scriptproviderforpython.mk
+++ b/scripting/Package_scriptproviderforpython.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,scriptproviderforpython,$(SRCDIR)/scripting/sou
$(eval $(call gb_Package_set_outdir,scriptproviderforpython,$(INSTDIR)))
-$(eval $(call gb_Package_add_file,scriptproviderforpython,program/services/scriptproviderforpython.rdb,scriptproviderforpython.rdb))
-$(eval $(call gb_Package_add_file,scriptproviderforpython,program/pythonscript.py,pythonscript.py))
+$(eval $(call gb_Package_add_file,scriptproviderforpython,$(gb_PROGRAMDIRNAME)/services/scriptproviderforpython.rdb,scriptproviderforpython.rdb))
+$(eval $(call gb_Package_add_file,scriptproviderforpython,$(gb_PROGRAMDIRNAME)/pythonscript.py,pythonscript.py))
# vim: set noet sw=4 ts=4:
diff --git a/shell/Package_scripts.mk b/shell/Package_scripts.mk
index a794e3e9bf5a..3bccf286bb2f 100644
--- a/shell/Package_scripts.mk
+++ b/shell/Package_scripts.mk
@@ -11,8 +11,8 @@ $(eval $(call gb_Package_Package,shell_scripts,$(SRCDIR)/shell/source/unix/misc)
$(eval $(call gb_Package_set_outdir,shell_scripts,$(INSTDIR)))
-$(eval $(call gb_Package_add_file,shell_scripts,program/cde-open-url,cde-open-url.sh))
-$(eval $(call gb_Package_add_file,shell_scripts,program/open-url,open-url.sh))
-$(eval $(call gb_Package_add_file,shell_scripts,program/tde-open-url,tde-open-url.sh))
+$(eval $(call gb_Package_add_file,shell_scripts,$(gb_PROGRAMDIRNAME)/cde-open-url,cde-open-url.sh))
+$(eval $(call gb_Package_add_file,shell_scripts,$(gb_PROGRAMDIRNAME)/open-url,open-url.sh))
+$(eval $(call gb_Package_add_file,shell_scripts,$(gb_PROGRAMDIRNAME)/tde-open-url,tde-open-url.sh))
# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/Package_scripts_gnome.mk b/shell/Package_scripts_gnome.mk
index a9737e5371c0..194dbef113b7 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,$(INSTDIR)))
-$(eval $(call gb_Package_add_file,shell_scripts_gnome,program/gnome-open-url,gnome-open-url.sh))
+$(eval $(call gb_Package_add_file,shell_scripts_gnome,$(gb_PROGRAMDIRNAME)/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 95f15986c99b..5214df21575a 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,$(INSTDIR)))
-$(eval $(call gb_Package_add_file,shell_scripts_kde,program/kde-open-url,kde-open-url.sh))
+$(eval $(call gb_Package_add_file,shell_scripts_kde,$(gb_PROGRAMDIRNAME)/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 c94cb8a2c78a..b2a7c28f95a9 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,$(INSTDIR)))
-$(eval $(call gb_Package_add_file,shell_senddoc,program/senddoc,senddoc.sh))
+$(eval $(call gb_Package_add_file,shell_senddoc,$(gb_PROGRAMDIRNAME)/senddoc,senddoc.sh))
# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/solenv/Package_gdb_install.mk b/solenv/Package_gdb_install.mk
index e596f68540c0..af67cb5c982d 100644
--- a/solenv/Package_gdb_install.mk
+++ b/solenv/Package_gdb_install.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,solenv_gdb_install,$(call gb_CustomTarget_get_w
$(eval $(call gb_Package_set_outdir,solenv_gdb_install,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,solenv_gdb_install,program,\
+$(eval $(call gb_Package_add_files,solenv_gdb_install,$(gb_PROGRAMDIRNAME),\
$(call gb_Library_get_runtime_filename,svl)-gdb.py \
$(call gb_Library_get_runtime_filename,sw)-gdb.py \
$(call gb_Library_get_runtime_filename,tl)-gdb.py \
diff --git a/solenv/gbuild/Pyuno.mk b/solenv/gbuild/Pyuno.mk
index f13831311062..267f2b4446ce 100644
--- a/solenv/gbuild/Pyuno.mk
+++ b/solenv/gbuild/Pyuno.mk
@@ -13,9 +13,6 @@
#
# Provides one filelist, called Pyuno/<name>.
-# platform
-# gb_Pyuno_PROGRAMDIRNAME
-
$(dir $(call gb_Pyuno_get_target,%)).dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
@@ -49,7 +46,7 @@ endef
# gb_Pyuno_add_file component destination source
define gb_Pyuno_add_file
-$(call gb_Package_add_file,$(call gb_Pyuno_get_packagename,$(1)),$(gb_Pyuno_PROGRAMDIRNAME)/$(2),$(3))
+$(call gb_Package_add_file,$(call gb_Pyuno_get_packagename,$(1)),$(gb_PROGRAMDIRNAME)/$(2),$(3))
endef
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 6f635909b27b..5bcb0380835f 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -28,6 +28,8 @@
gb_CPUDEFS := -DARM32
+gb_PROGRAMDIRNAME := program
+
ifeq ($(CC),)
$(error You must set CC in the environment. See README.cross for example.)
endif
@@ -290,10 +292,6 @@ endef
gb_UIMenubarTarget_UIMenubarTarget_platform :=
-# Pyuno class
-
-gb_Pyuno_PROGRAMDIRNAME := program
-
# Python
gb_PYTHON_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 77c2218e6e64..b7760df46831 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -30,6 +30,8 @@ gb_COMPILERDEFAULTOPTFLAGS := -Os
gb_CPUDEFS := -D_M_IX86
gb_TMPDIR:=$(if $(TMPDIR),$(TMPDIR),/tmp)
+gb_PROGRAMDIRNAME := program
+
# please make generic modifications to either of these
include $(GBUILDDIR)/platform/com_GCC_defs.mk
include $(GBUILDDIR)/platform/windows.mk
@@ -425,10 +427,6 @@ endef
gb_UIMenubarTarget_UIMenubarTarget_platform :=
-# Pyuno class
-
-gb_Pyuno_PROGRAMDIRNAME := program
-
# Python
gb_PYTHON_PRECOMMAND := PATH="$${PATH}:$(OUTDIR_FOR_BUILD)/bin" PYTHONHOME="$(OUTDIR_FOR_BUILD)/lib/python" PYTHONPATH="$(OUTDIR_FOR_BUILD)/lib/python;$(OUTDIR_FOR_BUILD)/lib/python/lib-dynload"
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 107e6e5d8e8d..1c461fce5af5 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -28,6 +28,8 @@
gb_DEVINSTALLROOT := $(DEVINSTALLDIR)/opt
+gb_PROGRAMDIRNAME := program
+
# Convert path to file URL.
define gb_Helper_make_url
file:///$(strip $(1))
@@ -599,10 +601,6 @@ endef
gb_UIMenubarTarget_UIMenubarTarget_platform :=
-# Pyuno class
-
-gb_Pyuno_PROGRAMDIRNAME := program
-
# Python
gb_Python_PRECOMMAND := PATH="$(shell cygpath -w $(INSTDIR)/program);$(shell cygpath -w $(OUTDIR)/bin)" PYTHONHOME="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)" PYTHONPATH="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib;$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib/lib-dynload:$(INSTDIR)/program"
gb_Python_INSTALLED_EXECUTABLE := $(gb_DEVINSTALLROOT)/program/python.exe
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 80fdfb900c1e..5d6bd8bb6689 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -28,6 +28,8 @@
gb_DEVINSTALLROOT := $(DEVINSTALLDIR)/opt/LibreOffice.app/Contents
+gb_PROGRAMDIRNAME := MacOS
+
gb_SDKDIR := $(MACOSX_SDK_PATH)
include $(GBUILDDIR)/platform/com_GCC_defs.mk
@@ -408,10 +410,6 @@ gb_Python_INSTALLED_EXECUTABLE := $(gb_DEVINSTALLROOT)/program/LibreOfficePython
# this is passed to gdb as executable when running tests
gb_Python_INSTALLED_EXECUTABLE_GDB := $(gb_Python_INSTALLED_EXECUTABLE)
-# Pyuno class
-
-gb_Pyuno_PROGRAMDIRNAME := MacOS
-
include $(GBUILDDIR)/platform/com_GCC_class.mk
# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 43d4e1b73448..31d5c19d4175 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -28,6 +28,8 @@
gb_DEVINSTALLROOT := $(DEVINSTALLDIR)/opt
+gb_PROGRAMDIRNAME := program
+
include $(GBUILDDIR)/platform/com_GCC_defs.mk
gb_MKTEMP := mktemp -t gbuild.XXXXXX
@@ -432,10 +434,6 @@ endef
gb_UIMenubarTarget_UIMenubarTarget_platform :=
-# Pyuno class
-
-gb_Pyuno_PROGRAMDIRNAME := program
-
# Python
gb_Python_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)" PYTHONPATH="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib:$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib/lib-dynload"
gb_Python_INSTALLED_EXECUTABLE := /bin/sh $(gb_DEVINSTALLROOT)/program/python
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index bbfe16888ab9..7785cd185426 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -28,6 +28,8 @@
gb_DEVINSTALLROOT := $(DEVINSTALLDIR)/opt
+gb_PROGRAMDIRNAME := program
+
include $(GBUILDDIR)/platform/com_GCC_defs.mk
gb_CCVER := $(shell $(gb_CC) -dumpversion | $(gb_AWK) -F. -- '{ print $$1*10000+$$2*100+$$3 }')
@@ -430,10 +432,6 @@ endef
gb_UIMenubarTarget_UIMenubarTarget_platform :=
-# Pyuno class
-
-gb_Pyuno_PROGRAMDIRNAME := program
-
# Python
gb_Python_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)" PYTHONPATH="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib:$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib/lib-dynload"
gb_Python_INSTALLED_EXECUTABLE := /bin/sh $(gb_DEVINSTALLROOT)/program/python
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 04:47:39 +0000