diff --git a/packaging/win32/install.sh b/packaging/win32/install.sh index fc61ce3d7d..d81570ff38 100644 --- a/packaging/win32/install.sh +++ b/packaging/win32/install.sh @@ -21,6 +21,7 @@ SEPS_GUILE_LDFLAGS=" " SEPS_INTLTOOL_PERL=" " SEPS_PATH=":" SEPS_PKG_CONFIG=":" +PKG_CONFIG="" SEPS_PKG_CONFIG_PATH=":" SEPS_READLINE_CPPFLAGS=" " SEPS_READLINE_LDFLAGS=" " @@ -467,7 +468,7 @@ function inst_gnome() { add_to_env $_GNOME_UDIR/bin/pkg-config-msys.sh PKG_CONFIG add_to_env "-I $_GNOME_UDIR/share/aclocal" ACLOCAL_FLAGS if quiet gconftool-2 --version && - pkg-config --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-3.8 && + ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-3.8 && quiet intltoolize --version then echo "gnome packages installed. skipping." @@ -537,12 +538,12 @@ function inst_gnome() { # work around a bug in msys bash, adding 0x01 smilies cat > bin/pkg-config-msys.sh < /dev/null 2>&1 ; then +if ${PKG_CONFIG} "\$@" > /dev/null 2>&1 ; then res=true else res=false fi -pkg-config "\$@" | tr -d \\\\r && \$res +${PKG_CONFIG} "\$@" | tr -d \\\\r && \$res EOF _FREETYPE_VERSION=`echo $FREETYPE_DEV_URL | sed 's#.*freetype-\(.*\)-lib.zip#\1#'` cat > lib/pkgconfig/freetype2.pc <