Fixes for cross-compilation on OS X (to iOS)

Introduce SDKDIRNAME as a configury variable and use it instead of the
gbuild gb_Package_SDKDIRNAME. Then we can easily construct the
SDKDIRNAME_FOR_BUILD variant that is needed to find the specially
named SDK in instdir on OS X when cross-compiling.

Move the version number section in configure.ac earlier.

Change-Id: Iee3db1a50ad4c7a9f91bbc5e0d0b01d76a76f701

20 files changed, 22 insertions, 22 deletions

diff --git a/odk/CustomTarget_allheaders.mk b/odk/CustomTarget_allheaders.mk
index e44497e65315..66df9c006855 100644
--- a/odk/CustomTarget_allheaders.mk
+++ b/odk/CustomTarget_allheaders.mk
@@ -24,7 +24,7 @@ $(odk_allheaders_DIR)/allheaders.hxx : \
 	printf '#endif\n' >> $@ \
 	$(foreach file,$(shell cat $^),\
 		$(if $(findstring /win32/,$(file)),&& printf '#ifdef WNT\n' >> $@) \
-	    && printf '#include <%s>\n' $(subst $(INSTDIR)/$(gb_Package_SDKDIRNAME)/include/,,$(file)) >> $@ \
+	    && printf '#include <%s>\n' $(subst $(INSTDIR)/$(SDKDIRNAME)/include/,,$(file)) >> $@ \
 		$(if $(findstring /win32/,$(file)),&& printf '#endif // WNT\n' >> $@) \
 	)
 
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 46042a49726c..bba54fbde03a 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -47,7 +47,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1)
 	$(call gb_Helper_print_on_error,\
 		$(PERL) $< \
-			$(INSTDIR)/$(gb_Package_SDKDIRNAME) \
+			$(INSTDIR)/$(SDKDIRNAME) \
 			$(odk_PLATFORM) "$(gb_Executable_EXT)" \
 		,$@.log \
 	)
diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk
index 9be0fad72307..6fe5096621f5 100644
--- a/odk/CustomTarget_doxygen.mk
+++ b/odk/CustomTarget_doxygen.mk
@@ -24,7 +24,7 @@ odk_cpp_INCFILELIST := com/sun/star/uno/Any.h \
 
 # Cygwin Doxygen needs unix paths
 odk_cygwin_path = $(if $(filter WNT,$(OS)),$(shell cygpath -u $(1)),$(1))
-odk_cpp_PREFIX := $(INSTDIR)/$(gb_Package_SDKDIRNAME)/include/
+odk_cpp_PREFIX := $(INSTDIR)/$(SDKDIRNAME)/include/
 odk_cpp_DOXY_INPUT := $(SRCDIR)/odk/docs/cpp/main.dox \
 	$(SRCDIR)/include/sal/log-areas.dox \
 	$(addprefix $(odk_cpp_PREFIX),$(odk_cpp_INCDIRLIST) $(odk_cpp_INCFILELIST))
diff --git a/odk/GeneratedPackage_odk_doxygen.mk b/odk/GeneratedPackage_odk_doxygen.mk
index 48dfe043338f..869ac7fb9a97 100644
--- a/odk/GeneratedPackage_odk_doxygen.mk
+++ b/odk/GeneratedPackage_odk_doxygen.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_GeneratedPackage_GeneratedPackage,odk_doxygen,$(call gb_CustomT
 
 $(eval $(call gb_GeneratedPackage_use_customtarget,odk_doxygen,odk/docs))
 
-$(eval $(call gb_GeneratedPackage_add_dir,odk_doxygen,$(INSTDIR)/$(gb_Package_SDKDIRNAME)/docs/cpp/ref,cpp/ref))
-$(eval $(call gb_GeneratedPackage_add_dir,odk_doxygen,$(INSTDIR)/$(gb_Package_SDKDIRNAME)/docs/idl/ref,idl/ref))
+$(eval $(call gb_GeneratedPackage_add_dir,odk_doxygen,$(INSTDIR)/$(SDKDIRNAME)/docs/cpp/ref,cpp/ref))
+$(eval $(call gb_GeneratedPackage_add_dir,odk_doxygen,$(INSTDIR)/$(SDKDIRNAME)/docs/idl/ref,idl/ref))
 
 # vim: set noet sw=4 ts=4:
diff --git a/odk/GeneratedPackage_uno_loader_classes.mk b/odk/GeneratedPackage_uno_loader_classes.mk
index 3af67c0d4e6b..42b5f5c31de0 100644
--- a/odk/GeneratedPackage_uno_loader_classes.mk
+++ b/odk/GeneratedPackage_uno_loader_classes.mk
@@ -11,6 +11,6 @@ $(eval $(call gb_GeneratedPackage_GeneratedPackage,odk_uno_loader_classes,$(call
 
 $(eval $(call gb_GeneratedPackage_use_customtarget,odk_uno_loader_classes,odk/classes))
 
-$(eval $(call gb_GeneratedPackage_add_dir,odk_uno_loader_classes,$(INSTDIR)/$(gb_Package_SDKDIRNAME)/classes/com/sun/star/lib/loader,com/sun/star/lib/loader))
+$(eval $(call gb_GeneratedPackage_add_dir,odk_uno_loader_classes,$(INSTDIR)/$(SDKDIRNAME)/classes/com/sun/star/lib/loader,com/sun/star/lib/loader))
 
 # vim: set noet sw=4 ts=4:
diff --git a/odk/Package_cli.mk b/odk/Package_cli.mk
index 02f3b2082f60..80ec1f931fdc 100644
--- a/odk/Package_cli.mk
+++ b/odk/Package_cli.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,odk_cli,$(OUTDIR)/bin))
 
 $(eval $(call gb_Package_set_outdir,odk_cli,$(INSTDIR)))
 
-$(eval $(call gb_Package_add_files,odk_cli,$(gb_Package_SDKDIRNAME)/cli,\
+$(eval $(call gb_Package_add_files,odk_cli,$(SDKDIRNAME)/cli,\
 	cli_basetypes.dll \
 	cli_oootypes.dll \
 	cli_ure.dll \
diff --git a/odk/Package_config.mk b/odk/Package_config.mk
index a58620eb05be..6efe33b1d4f8 100644
--- a/odk/Package_config.mk
+++ b/odk/Package_config.mk
@@ -12,13 +12,13 @@ $(eval $(call gb_Package_Package,odk_config,$(SRCDIR)/odk/config))
 $(eval $(call gb_Package_set_outdir,odk_config,$(INSTDIR)))
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Package_add_files,odk_config,$(gb_Package_SDKDIRNAME),\
+$(eval $(call gb_Package_add_files,odk_config,$(SDKDIRNAME),\
 	cfgWin.js \
 	setsdkenv_windows.template \
 	setsdkname.bat \
 ))
 else
-$(eval $(call gb_Package_add_files,odk_config,$(gb_Package_SDKDIRNAME),\
+$(eval $(call gb_Package_add_files,odk_config,$(SDKDIRNAME),\
 	configure.pl \
 	setsdkenv_unix \
 	setsdkenv_unix.sh.in \
diff --git a/odk/Package_config_notwin.mk b/odk/Package_config_notwin.mk
index 37c1b2beed43..8bd2d513f668 100644
--- a/odk/Package_config_notwin.mk
+++ b/odk/Package_config_notwin.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,odk_config_notwin,$(SRCDIR)))
 
 $(eval $(call gb_Package_set_outdir,odk_config_notwin,$(INSTDIR)))
 
-$(eval $(call gb_Package_add_files,odk_config_notwin,$(gb_Package_SDKDIRNAME),\
+$(eval $(call gb_Package_add_files,odk_config_notwin,$(SDKDIRNAME),\
 	config.guess \
 	config.sub \
 ))
diff --git a/odk/Package_config_win.mk b/odk/Package_config_win.mk
index c2dadad6f3ca..8c7a007fdce5 100644
--- a/odk/Package_config_win.mk
+++ b/odk/Package_config_win.mk
@@ -11,6 +11,6 @@ $(eval $(call gb_Package_Package,odk_config_win,$(call gb_CustomTarget_get_workd
 
 $(eval $(call gb_Package_set_outdir,odk_config_win,$(INSTDIR)))
 
-$(eval $(call gb_Package_add_file,odk_config_win,$(gb_Package_SDKDIRNAME)/setsdkenv_windows.bat,setsdkenv_windows.bat))
+$(eval $(call gb_Package_add_file,odk_config_win,$(SDKDIRNAME)/setsdkenv_windows.bat,setsdkenv_windows.bat))
 
 # vim: set noet sw=4 ts=4:
diff --git a/odk/Package_docs.mk b/odk/Package_docs.mk
index 515c682b1d2e..8d0c8dbb7619 100644
--- a/odk/Package_docs.mk
+++ b/odk/Package_docs.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,odk_docs,$(SRCDIR)/odk))
 
 $(eval $(call gb_Package_set_outdir,odk_docs,$(INSTDIR)))
 
-$(eval $(call gb_Package_add_files_with_dir,odk_docs,$(gb_Package_SDKDIRNAME),\
+$(eval $(call gb_Package_add_files_with_dir,odk_docs,$(SDKDIRNAME),\
 	docs/images/arrow-1.gif \
 	docs/images/arrow-2.gif \
 	docs/images/arrow-3.gif \
diff --git a/odk/Package_examples.mk b/odk/Package_examples.mk
index 0c8a70540711..b6aaae77d075 100644
--- a/odk/Package_examples.mk
+++ b/odk/Package_examples.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,odk_examples,$(SRCDIR)/odk/examples))
 
 $(eval $(call gb_Package_set_outdir,odk_examples,$(INSTDIR)))
 
-$(eval $(call gb_Package_add_files_with_dir,odk_examples,$(gb_Package_SDKDIRNAME)/examples,\
+$(eval $(call gb_Package_add_files_with_dir,odk_examples,$(SDKDIRNAME)/examples,\
     CLI/CSharp/Spreadsheet/GeneralTableSample.cs \
     CLI/CSharp/Spreadsheet/Makefile \
     CLI/CSharp/Spreadsheet/SpreadsheetDocHelper.cs \
diff --git a/odk/Package_html.mk b/odk/Package_html.mk
index fd18426d9d91..fdac50654e44 100644
--- a/odk/Package_html.mk
+++ b/odk/Package_html.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,odk_html,$(call gb_CustomTarget_get_workdir,odk
 
 $(eval $(call gb_Package_set_outdir,odk_html,$(INSTDIR)))
 
-$(eval $(call gb_Package_add_files_with_dir,odk_html,$(gb_Package_SDKDIRNAME),\
+$(eval $(call gb_Package_add_files_with_dir,odk_html,$(SDKDIRNAME),\
 	docs/install.html \
 	docs/tools.html \
 	examples/DevelopersGuide/examples.html \
diff --git a/odk/Package_javadoc.mk b/odk/Package_javadoc.mk
index 15b0691501a8..5f0ea44a4c36 100644
--- a/odk/Package_javadoc.mk
+++ b/odk/Package_javadoc.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,odk_javadoc,$(call gb_CustomTarget_get_workdir,
 
 $(eval $(call gb_Package_set_outdir,odk_javadoc,$(INSTDIR)))
 
-$(eval $(call gb_Package_add_files_with_dir,odk_javadoc,$(gb_Package_SDKDIRNAME)/docs/java/ref,\
+$(eval $(call gb_Package_add_files_with_dir,odk_javadoc,$(SDKDIRNAME)/docs/java/ref,\
 	allclasses-frame.html \
 	allclasses-noframe.html \
 	com/sun/star/comp/helper/Bootstrap.html \
diff --git a/odk/Package_lib.mk b/odk/Package_lib.mk
index c9758f8ca44a..05465c03812f 100644
--- a/odk/Package_lib.mk
+++ b/odk/Package_lib.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,odk_lib,$(WORKDIR)/LinkTarget/StaticLibrary))
 
 $(eval $(call gb_Package_set_outdir,odk_lib,$(INSTDIR)))
 
-$(eval $(call gb_Package_add_files,odk_lib,$(gb_Package_SDKDIRNAME)/lib,\
+$(eval $(call gb_Package_add_files,odk_lib,$(SDKDIRNAME)/lib,\
 	$(if $(filter LINUX,$(OS)),$(notdir $(call gb_StaticLibrary_get_target,salcpprt))) \
 ))
 
diff --git a/odk/Package_odk_headers.mk b/odk/Package_odk_headers.mk
index fca30c43046e..3a05a01b9a40 100644
--- a/odk/Package_odk_headers.mk
+++ b/odk/Package_odk_headers.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_Package_Package,odk_headers,$(SRCDIR)/include))
 
 $(eval $(call gb_Package_set_outdir,odk_headers,$(INSTDIR)))
 
-$(eval $(call gb_Package_add_files_with_dir,odk_headers,$(gb_Package_SDKDIRNAME)/include,\
+$(eval $(call gb_Package_add_files_with_dir,odk_headers,$(SDKDIRNAME)/include,\
 	com/sun/star/uno/Any.h \
 	com/sun/star/uno/Any.hxx \
 	com/sun/star/uno/Reference.h \
diff --git a/odk/Package_odk_headers_generated.mk b/odk/Package_odk_headers_generated.mk
index fff5c6b85750..819edcdb1dcc 100644
--- a/odk/Package_odk_headers_generated.mk
+++ b/odk/Package_odk_headers_generated.mk
@@ -12,6 +12,6 @@ $(eval $(call gb_Package_Package,odk_headers_generated,$(BUILDDIR)/config_$(gb_S
 
 $(eval $(call gb_Package_set_outdir,odk_headers_generated,$(INSTDIR)))
 
-$(eval $(call gb_Package_add_file,odk_headers_generated,$(gb_Package_SDKDIRNAME)/include/sal/typesizes.h,config_typesizes.h))
+$(eval $(call gb_Package_add_file,odk_headers_generated,$(SDKDIRNAME)/include/sal/typesizes.h,config_typesizes.h))
 
 # vim: set noet sw=4 ts=4:
diff --git a/odk/Package_settings.mk b/odk/Package_settings.mk
index 2490717f672f..74fc071b1d2b 100644
--- a/odk/Package_settings.mk
+++ b/odk/Package_settings.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,odk_settings,$(SRCDIR)/odk/settings))
 
 $(eval $(call gb_Package_set_outdir,odk_settings,$(INSTDIR)))
 
-$(eval $(call gb_Package_add_files,odk_settings,$(gb_Package_SDKDIRNAME)/settings,\
+$(eval $(call gb_Package_add_files,odk_settings,$(SDKDIRNAME)/settings,\
 	$(if $(filter WNT,$(OS)),component.uno.def) \
 	platform.mk \
 	settings.mk \
diff --git a/odk/Package_settings_generated.mk b/odk/Package_settings_generated.mk
index 1b3f6379bd57..6264a564b4ab 100644
--- a/odk/Package_settings_generated.mk
+++ b/odk/Package_settings_generated.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,odk_settings_generated,$(call gb_CustomTarget_g
 
 $(eval $(call gb_Package_set_outdir,odk_settings_generated,$(INSTDIR)))
 
-$(eval $(call gb_Package_add_files,odk_settings_generated,$(gb_Package_SDKDIRNAME)/settings,\
+$(eval $(call gb_Package_add_files,odk_settings_generated,$(SDKDIRNAME)/settings,\
 	dk.mk \
 ))
 
diff --git a/odk/Package_share_readme.mk b/odk/Package_share_readme.mk
index 5128d6ba6409..79d8e17259c6 100644
--- a/odk/Package_share_readme.mk
+++ b/odk/Package_share_readme.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,odk_share_readme,$(OUTDIR)/bin))
 
 $(eval $(call gb_Package_set_outdir,odk_share_readme,$(INSTDIR)))
 
-$(eval $(call gb_Package_add_files,odk_share_readme,$(gb_Package_SDKDIRNAME)/share/readme,\
+$(eval $(call gb_Package_add_files,odk_share_readme,$(SDKDIRNAME)/share/readme,\
 	LICENSE.html \
 	osl/$(gb_LICENSE) \
 	osl/$(call gb_README,en-US) \
diff --git a/odk/Package_unowinreg.mk b/odk/Package_unowinreg.mk
index f253547b7035..a62ddadebd04 100644
--- a/odk/Package_unowinreg.mk
+++ b/odk/Package_unowinreg.mk
@@ -23,6 +23,6 @@ $(eval $(call gb_Package_Package,odk_unowinreg,$(odk_unowinreg_DIR)))
 
 $(eval $(call gb_Package_set_outdir,odk_unowinreg,$(INSTDIR)))
 
-$(eval $(call gb_Package_add_file,odk_unowinreg,$(gb_Package_SDKDIRNAME)/classes/win/unowinreg.dll,$(odk_unowinreg_FILE)))
+$(eval $(call gb_Package_add_file,odk_unowinreg,$(SDKDIRNAME)/classes/win/unowinreg.dll,$(odk_unowinreg_FILE)))
 
 # vim: set noet sw=4 ts=4: