diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-09-23 15:34:26 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-09-23 15:38:10 +0300 |
| commit | 0618b35ebda29b911058254cd34620e8b24ab8f7 (patch) | |
| tree | 381c2b5531b4745c0cd89b5994022bf98a37c08d /odk/Package_config.mk | |
| parent | 3f516cc112599c7e55672a178a62081b70fa91ef (diff) | |
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
Diffstat (limited to 'odk/Package_config.mk')
| -rw-r--r-- | odk/Package_config.mk | 4 |
1 files changed, 2 insertions, 2 deletions
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 \ |