Commit c2a9cb1a authored by Jean-Paul Saman's avatar Jean-Paul Saman

Forcefully set PKG_CONFIG_PATH and PKG_CONFIG_LIBDIR for pkgconfig only if...

Forcefully set PKG_CONFIG_PATH and PKG_CONFIG_LIBDIR for pkgconfig only if these environment variables haven't been set yet. And the path /usr/lib/pkgconfig exists. This fixes building wxwidgets in contrib for Fedora Core 6
parent 6cd43af7
......@@ -146,7 +146,14 @@ case $HOST in
;;
*)
if test "$HOST" = "$BUILD"; then
echo "PKG_CONFIG_LIBDIR = /usr/lib/pkgconfig" >> config.mak
if test -d "/usr/lib/pkgconfig"; then
if test -z "$PKG_CONFIG_PATH"; then
echo "PKG_CONFIG_PATH = /usr/lib/pkgconfig" >> config.mak
fi
if test -z "$PKG_CONFIG_LIBDIR"; then
echo "PKG_CONFIG_LIBDIR = /usr/lib/pkgconfig" >> config.mak
fi
fi
fi
# Try to match distribution
if test -f /etc/fedora-release; then
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment