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/libxslt | |
| parent | c03ff5ebc0f008825e45285f7c4021329bd60c05 (diff) | |
libxml2, libxslt: use executables from WORKDIR
Change-Id: I1324c8f21e31c69b9780136cc777e1aea3bc546e
Diffstat (limited to 'external/libxslt')
| -rw-r--r-- | external/libxslt/ExternalPackage_xslt.mk | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/external/libxslt/ExternalPackage_xslt.mk b/external/libxslt/ExternalPackage_xslt.mk index d91b509aada9..d645ed3640c6 100644 --- a/external/libxslt/ExternalPackage_xslt.mk +++ b/external/libxslt/ExternalPackage_xslt.mk @@ -11,32 +11,22 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,xslt,xslt)) $(eval $(call gb_ExternalPackage_use_external_project,xslt,xslt)) -ifneq ($(COM),MSC) -$(eval $(call gb_ExternalPackage_add_file,xslt,bin/xslt-config,xslt-config)) -endif - +ifneq ($(DISABLE_DYNLOADING),TRUE) ifeq ($(OS),MACOSX) $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,lib/libxslt.1.dylib,libxslt/.libs/libxslt.1.dylib)) $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,lib/libexslt.0.dylib,libexslt/.libs/libexslt.0.dylib)) -$(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc,xsltproc/.libs/xsltproc)) -else ifeq ($(DISABLE_DYNLOADING),TRUE) -ifneq ($(CROSS_COMPILING),YES) -$(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc,xsltproc/xsltproc)) -endif else ifeq ($(OS),WNT) ifeq ($(COM),GCC) $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,bin/libxslt.dll,libxslt/.libs/libxslt.dll)) $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,bin/libexslt.dll,libexslt/.libs/libexslt.dll)) -$(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc.exe,xsltproc/.libs/xsltproc.exe)) else # COM=MSC $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,bin/libxslt.dll,win32/bin.msvc/libxslt.dll)) $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,bin/libexslt.dll,win32/bin.msvc/libexslt.dll)) -$(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc.exe,win32/bin.msvc/xsltproc.exe)) endif else # OS!=WNT $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,lib/libxslt.so.1,libxslt/.libs/libxslt.so.1.1.26)) $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,lib/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.15)) -$(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc,xsltproc/.libs/xsltproc)) endif +endif # DISABLE_DYNLOADING # vim: set noet sw=4 ts=4: |