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/GeneratedPackage_odk_doxygen.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/GeneratedPackage_odk_doxygen.mk')
| -rw-r--r-- | odk/GeneratedPackage_odk_doxygen.mk | 4 |
1 files changed, 2 insertions, 2 deletions
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: |