From b181f41497f00b5896986e2e52f2a86af57eb98e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 11 Mar 2015 12:14:00 +0100 Subject: [PATCH] hooks/script-wrapper: fix mysql_config and others. --- common/hooks/pre-configure/02-script-wrapper.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh index 175dee5286a..4e14b3fcd82 100644 --- a/common/hooks/pre-configure/02-script-wrapper.sh +++ b/common/hooks/pre-configure/02-script-wrapper.sh @@ -24,9 +24,9 @@ generic_wrapper2() { if [ "\$1" = "--prefix" ]; then echo "${XBPS_CROSS_BASE}/usr" elif [ "\$1" = "--cflags" ]; then - ${XBPS_CROSS_BASE}/usr/bin/${wrapper} --cflags | sed -e "s,-I/usr,-I${XBPS_CROSS_BASE}/usr,g;s,-L/usr,-L${XBPS_CROSS_BASE}/usr,g" + ${XBPS_CROSS_BASE}/usr/bin/${wrapper} --cflags | sed -e "s,-I/usr/include,-I${XBPS_CROSS_BASE}/usr/include,g" elif [ "\$1" = "--libs" ]; then - ${XBPS_CROSS_BASE}/usr/bin/${wrapper} --libs | sed -e "s,-L/usr,-L${XBPS_CROSS_BASE}/usr,g" + ${XBPS_CROSS_BASE}/usr/bin/${wrapper} --libs | sed -e "s,-L/usr/lib,-L${XBPS_CROSS_BASE}/usr/lib,g" else exec ${XBPS_CROSS_BASE}/usr/bin/${wrapper} "\$@" fi @@ -95,10 +95,10 @@ hook() { generic_wrapper2 curl-config generic_wrapper2 gpg-error-config generic_wrapper2 libassuan-config + generic_wrapper2 mysql_config generic_wrapper3 libpng-config generic_wrapper3 xmlrpc-c-config generic_wrapper3 krb5-config - generic_wrapper3 mysql_config generic_wrapper3 taglib-config generic_wrapper3 cups-config generic_wrapper3 Magick-config