diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-25 22:36:07 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-27 00:50:02 +0200 |
| commit | 349015b18e285b9642e0b16a5e4db61ef347a6a8 (patch) | |
| tree | be3b36ba75e167cea6d13f91e26fcc596e9e2d28 /external/libxml2 | |
| parent | 90d7723085a8da0929c7c17587a7717ceeb23d36 (diff) | |
gbuild: remove gb_ExternalPackage_add_library_for_install
Deliver all external libraries to INSTDIR directly.
Change-Id: I8d3e035e5cfa07bd0f53ee4a226c48d4b86a4032
Diffstat (limited to 'external/libxml2')
| -rw-r--r-- | external/libxml2/ExternalPackage_xml2.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/external/libxml2/ExternalPackage_xml2.mk b/external/libxml2/ExternalPackage_xml2.mk index 69a6e886dfb6..7102dfdf70ff 100644 --- a/external/libxml2/ExternalPackage_xml2.mk +++ b/external/libxml2/ExternalPackage_xml2.mk @@ -9,19 +9,21 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,xml2,xml2)) +$(eval $(call gb_ExternalPackage_set_outdir,xml2,$(INSTROOT))) + $(eval $(call gb_ExternalPackage_use_external_project,xml2,xml2)) 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,$(LIBO_URE_LIB_FOLDER)/libxml2.2.dylib,.libs/libxml2.2.dylib)) 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,$(LIBO_URE_LIB_FOLDER)/libxml2.dll,.libs/libxml2.dll)) 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,$(LIBO_URE_LIB_FOLDER)/libxml2.dll,win32/bin.msvc/libxml2.dll)) 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,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.7.6)) endif endif # DISABLE_DYNLOADING |