From 3f658ca02e5f62499c27d9a36abfedbdf3c9beef Mon Sep 17 00:00:00 2001 From: Christian Stimming Date: Sun, 13 Dec 2009 21:16:25 +0000 Subject: [PATCH] Fix #586122 (follow-up to r18488) by using aqbanking/version.h from its installation path. Also look up the gwenhywfar so-name accordingly. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18495 57a11ea4-9604-0410-9ed3-97b8803252fd --- packaging/win32/dist.sh | 4 +++- packaging/win32/gnucash.iss.in | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packaging/win32/dist.sh b/packaging/win32/dist.sh index d107e5afcd..c2a9a8e38f 100755 --- a/packaging/win32/dist.sh +++ b/packaging/win32/dist.sh @@ -229,10 +229,12 @@ function dist_gnucash() { cp -a $_REPOS_UDIR/packaging/win32/install-fq-mods.cmd $DIST_UDIR/bin _QTDIR_WIN=`echo $QTDIR | sed 's,^/\([A-Za-z]\)/,\1:/,g' ` - _AQBANKING_SO_EFFECTIVE=$(awk '/AQBANKING_SO_EFFECTIVE/ { print $3 }' $TMP_UDIR/aqbanking-*/version.h ) + _AQBANKING_SO_EFFECTIVE=$(awk '/AQBANKING_SO_EFFECTIVE/ { print $3 }' ${_AQBANKING_UDIR}/include/aqbanking/version.h ) + _GWENHYWFAR_SO_EFFECTIVE=$(awk '/GWENHYWFAR_SO_EFFECTIVE/ { print $3 }' ${_AQBANKING_UDIR}/include/gwenhywfar3/gwenhywfar/version.h ) sed < $_BUILD_UDIR/packaging/win32/gnucash.iss \ > $_GNUCASH_UDIR/gnucash.iss \ -e "s#@-qtbindir-@#${_QTDIR_WIN}/bin#g" \ + -e "s#@-gwenhywfar_so_effective-@#${_GWENHYWFAR_SO_EFFECTIVE}#g" \ -e "s#@-aqbanking_so_effective-@#${_AQBANKING_SO_EFFECTIVE}#g" } diff --git a/packaging/win32/gnucash.iss.in b/packaging/win32/gnucash.iss.in index 5f23818536..1d04ef5cea 100644 --- a/packaging/win32/gnucash.iss.in +++ b/packaging/win32/gnucash.iss.in @@ -129,7 +129,7 @@ Root: HKLM; Subkey: "Software\Gwenhywfar"; ValueType: none; Flags: uninsdeleteke Root: HKLM; Subkey: "Software\Gwenhywfar\Paths"; ValueType: none; Flags: uninsdeletekeyifempty Root: HKLM; Subkey: "Software\Gwenhywfar\Paths"; ValueType: string; ValueName: "prefix"; ValueData: "{app}"; Flags: uninsdeletevalue Root: HKLM; Subkey: "Software\Gwenhywfar\Paths"; ValueType: string; ValueName: "libdir"; ValueData: "{app}\lib"; Flags: uninsdeletevalue -Root: HKLM; Subkey: "Software\Gwenhywfar\Paths"; ValueType: string; ValueName: "plugindir"; ValueData: "{app}\lib\gwenhywfar\plugins\38"; Flags: uninsdeletevalue +Root: HKLM; Subkey: "Software\Gwenhywfar\Paths"; ValueType: string; ValueName: "plugindir"; ValueData: "{app}\lib\gwenhywfar\plugins\@-gwenhywfar_so_effective-@"; Flags: uninsdeletevalue Root: HKLM; Subkey: "Software\Gwenhywfar\Paths"; ValueType: string; ValueName: "sysconfdir"; ValueData: "{app}\etc"; Flags: uninsdeletevalue Root: HKLM; Subkey: "Software\Gwenhywfar\Paths"; ValueType: string; ValueName: "localedir"; ValueData: "{app}\share\locale"; Flags: uninsdeletevalue