More gb_PROGRAMDIRNAME clean up

Change-Id: I5af86e15bcb8958a680e7309f13d7a865f29d7a9

7 files changed, 13 insertions, 28 deletions

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