diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-22 18:47:56 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-22 22:30:20 +0200 |
| commit | e6c47b03d06d2e0c4b924baaf00d9a2412dc40e2 (patch) | |
| tree | cd2dc498a41ab663a23fb77fca6beb54a137e31b /external/libxml2 | |
| parent | c03ff5ebc0f008825e45285f7c4021329bd60c05 (diff) | |
libxml2, libxslt: use executables from WORKDIR
Change-Id: I1324c8f21e31c69b9780136cc777e1aea3bc546e
Diffstat (limited to 'external/libxml2')
| -rw-r--r-- | external/libxml2/ExternalPackage_xml2.mk | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/external/libxml2/ExternalPackage_xml2.mk b/external/libxml2/ExternalPackage_xml2.mk index a89e4a505d73..69a6e886dfb6 100644 --- a/external/libxml2/ExternalPackage_xml2.mk +++ b/external/libxml2/ExternalPackage_xml2.mk @@ -11,28 +11,18 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,xml2,xml2)) $(eval $(call gb_ExternalPackage_use_external_project,xml2,xml2)) -ifneq ($(COM),MSC) -$(eval $(call gb_ExternalPackage_add_file,xml2,bin/xml2-config,xml2-config)) -endif - +ifneq ($(DISABLE_DYNLOADING),TRUE) ifeq ($(OS),MACOSX) $(eval $(call gb_ExternalPackage_add_library_for_install,xml2,lib/libxml2.2.dylib,.libs/libxml2.2.dylib,xml2)) -$(eval $(call gb_ExternalPackage_add_file,xml2,bin/xmllint,.libs/xmllint)) -else ifeq ($(DISABLE_DYNLOADING),TRUE) -ifneq ($(CROSS_COMPILING),YES) -$(eval $(call gb_ExternalPackage_add_file,xml2,bin/xmllint,.libs/xmllint)) -endif else ifeq ($(OS),WNT) ifeq ($(COM),GCC) $(eval $(call gb_ExternalPackage_add_library_for_install,xml2,bin/libxml2.dll,.libs/libxml2.dll,xml2)) -$(eval $(call gb_ExternalPackage_add_file,xml2,bin/xmllint.exe,.libs/xmllint.exe)) else # COM=MSC $(eval $(call gb_ExternalPackage_add_library_for_install,xml2,bin/libxml2.dll,win32/bin.msvc/libxml2.dll,xml2)) -$(eval $(call gb_ExternalPackage_add_file,xml2,bin/xmllint.exe,win32/bin.msvc/xmllint.exe)) endif else # OS!=WNT $(eval $(call gb_ExternalPackage_add_library_for_install,xml2,lib/libxml2.so.2,.libs/libxml2.so.2.7.6,xml2)) -$(eval $(call gb_ExternalPackage_add_file,xml2,bin/xmllint,.libs/xmllint)) endif +endif # DISABLE_DYNLOADING # vim: set noet sw=4 ts=4: |