r15224 - gnucash/trunk/packaging/win32 - install.sh: Do not call pkg-config-msys.sh from within

[Andreas Köhler]

Author: andi5
Date: 2006-12-17 21:53:14 -0500 (Sun, 17 Dec 2006)
New Revision: 15224
Trac: http://svn.gnucash.org/trac/changeset/15224

Modified:
   gnucash/trunk/packaging/win32/install.sh
Log:
install.sh: Do not call pkg-config-msys.sh from within
pkg-config-msys.sh. Use correct header directory for regex (differs
between v3.8 and v3.8.g.3). Untested.


Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2006-12-17 18:32:18 UTC (rev 15223)
+++ gnucash/trunk/packaging/win32/install.sh	2006-12-18 02:53:14 UTC (rev 15224)
@@ -202,7 +202,7 @@
 function inst_regex() {
     setup RegEx
     _REGEX_UDIR=`unix_path $REGEX_DIR`
-    add_to_env -I$_REGEX_UDIR/include/rxspencer REGEX_CPPFLAGS
+    add_to_env -I$_REGEX_UDIR/include REGEX_CPPFLAGS
     add_to_env -L$_REGEX_UDIR/lib REGEX_LDFLAGS
     add_to_env $_REGEX_UDIR/bin PATH
     if quiet ${LD} $REGEX_LDFLAGS -lregex -o $TMP_UDIR/ofile
@@ -467,6 +467,7 @@
     add_to_env $_GNOME_UDIR/lib/pkgconfig PKG_CONFIG_PATH
     add_to_env $_GNOME_UDIR/bin/pkg-config-msys.sh PKG_CONFIG
     add_to_env "-I $_GNOME_UDIR/share/aclocal" ACLOCAL_FLAGS
+    _ORIG_PKG_CONFIG=$_GNOME_UDIR/bin/pkg-config
     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 &&
         quiet intltoolize --version
@@ -538,12 +539,12 @@
             # work around a bug in msys bash, adding 0x01 smilies
             cat > bin/pkg-config-msys.sh <<EOF
 #!/bin/sh
-if ${PKG_CONFIG} "\$@" > /dev/null 2>&1 ; then
+if ${_ORIG_PKG_CONFIG} "\$@" > /dev/null 2>&1 ; then
     res=true
 else
     res=false
 fi
-${PKG_CONFIG} "\$@" | tr -d \\\\r && \$res
+${_ORIG_PKG_CONFIG} "\$@" | tr -d \\\\r && \$res
 EOF
             _FREETYPE_VERSION=`echo $FREETYPE_DEV_URL | sed 's#.*freetype-\(.*\)-lib.zip#\1#'`
             cat > lib/pkgconfig/freetype2.pc <<EOF