diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | tools/verify-evolution-install.sh | 20 |
2 files changed, 21 insertions, 3 deletions
@@ -1,5 +1,9 @@ 2000-08-05 Dan Winship <danw@helixcode.com> + * tools/verify-evolution-install.sh: Look for oafinfo files in + oaf's prefix, not gnome-libs's. Allow binaries to be installed + anywhere in $PATH. + * configure.in, README: Update the README and the text of the Bonobo configure check to match reality. Remove the 0.15 vs 0.15-and-a-half check since we require post-0.16 now. diff --git a/tools/verify-evolution-install.sh b/tools/verify-evolution-install.sh index 00485463a1..bb6f084a5b 100755 --- a/tools/verify-evolution-install.sh +++ b/tools/verify-evolution-install.sh @@ -118,7 +118,7 @@ check_oafinfo() { #othername=$2 base=$1.oafinfo - search="${gl_datadir}/oaf:$OAF_INFO_PATH" + search="${oaf_prefix}/share/oaf:$OAF_INFO_PATH" IFSback="$IFS" IFS=":" ok=no @@ -174,8 +174,21 @@ check_bin() { #name=$1 #othername=$2 - if test ! -f ${gl_bindir}/$1 ; then - problem="The binary $1 isn't installed into Gnome's prefix" + IFSbak="$IFS" + search="$PATH" + IFS=":" + passed=no + + for ping in $search; do + if test -x $ping/$1 ; then + passed=yes; + fi + done + + IFS="$IFSbak" + + if test x"$passed" = xno ; then + problem="The binary $1 isn't in your PATH" rpmsolution="This problem shouldn't happen with RPM installations. Verify your installation of Helix Gnome." debsolution="This problem shouldn't happen with DEB installations. Verify your installation of Helix Gnome." srcsolution="Re-run 'configure' in $2's source directory with the flag '--bindir=$gl_bindir'." @@ -418,6 +431,7 @@ environment variable OAF_CLIENT pointing to it" problem fi +oaf_prefix=`$OAF_CONFIG --prefix` check_oafinfo oafd oaf #gconf |