IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

install.sh: Do not call pkg-config-msys.sh from within

Browse Source 
pkg-config-msys.sh. Use correct header directory for regex (differs
between v3.8 and v3.8.g.3). Untested.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@15224 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Andreas Köhler 2006-12-18 02:53:14 +00:00
parent 8d288704d7
commit eb6ca3e6d7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packaging/win32/install.sh
View File

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