Sophie

Sophie

distrib > Mageia > 7 > i586 > media > core-updates-src > by-pkgid > 591df75d59996d7a75226b4b5da6b5f6 > files > 13

virtualbox-6.1.16-4.mga7.src.rpm


 Config.kmk |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff -Nurp VirtualBox-6.0.2.orig/Config.kmk VirtualBox-6.0.2/Config.kmk
--- VirtualBox-6.0.2.orig/Config.kmk	2019-01-14 16:39:55.000000000 +0200
+++ VirtualBox-6.0.2/Config.kmk	2019-01-15 23:11:44.735978411 +0200
@@ -4038,19 +4038,19 @@ VBOXLNX32GUEST_SUFF_LIB = .a
 # SDKs for external libraries.
 #
 SDK_VBOX_LIBXML2           = .
-SDK_VBOX_LIBXML2_INCS     ?= $(PATH_ROOT)/src/libs/libxml2-2.9.4/include
+SDK_VBOX_LIBXML2_INCS     ?= /usr/include/libxml2
 SDK_VBOX_LIBXML2_DEFS     ?= _REENTRANT LIBXML_STATIC LIBXML_STATIC_FOR_DLL
 SDK_VBOX_LIBXML2_DEFS.win ?= WIN32 _WINDOWS _MBCS HAVE_WIN32_THREADS HAVE_COMPILER_TLS
 # Note: no linking to LIB here, we do that explicitly in src/VBox/Runtime/Makefile.kmk to link
 #       libxml against VBoxRT
 
 SDK_VBOX_LIBPNG       = .
-SDK_VBOX_LIBPNG_INCS ?= $(PATH_ROOT)/src/libs/libpng-1.6.36
+SDK_VBOX_LIBPNG_INCS ?= `/usr/bin/pkg-config libpng --variable=includedir`
 SDK_VBOX_LIBPNG_LIBS ?= $(PATH_STAGE_LIB)/VBox-libpng$(VBOX_SUFF_LIB)
 
 SDK_VBOX_ZLIB         = .
 if1of ($(KBUILD_TARGET), os2 solaris win)
- SDK_VBOX_ZLIB_INCS  ?= $(PATH_ROOT)/src/libs/zlib-1.2.11
+ SDK_VBOX_ZLIB_INCS  ?= /usr/include/
  SDK_VBOX_ZLIB_LIBS  ?= $(PATH_STAGE_LIB)/VBox-zlib$(VBOX_SUFF_LIB)
 else
  SDK_VBOX_ZLIB_INCS  ?=