aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2000-08-06 04:59:22 +0800
committerDan Winship <danw@src.gnome.org>2000-08-06 04:59:22 +0800
commit089f42f8dd81428b578939f385eb143254a83644 (patch)
treead330ce0527816a1bd7259afd96d6e62f9497536
parent58badd8763aca6101b86ed50e45695f798d56284 (diff)
downloadgsoc2013-evolution-089f42f8dd81428b578939f385eb143254a83644.tar
gsoc2013-evolution-089f42f8dd81428b578939f385eb143254a83644.tar.gz
gsoc2013-evolution-089f42f8dd81428b578939f385eb143254a83644.tar.bz2
gsoc2013-evolution-089f42f8dd81428b578939f385eb143254a83644.tar.lz
gsoc2013-evolution-089f42f8dd81428b578939f385eb143254a83644.tar.xz
gsoc2013-evolution-089f42f8dd81428b578939f385eb143254a83644.tar.zst
gsoc2013-evolution-089f42f8dd81428b578939f385eb143254a83644.zip
Look for oafinfo files in oaf's prefix, not gnome-libs's. Allow binaries
* 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. svn path=/trunk/; revision=4555
-rw-r--r--ChangeLog4
-rwxr-xr-xtools/verify-evolution-install.sh20
2 files changed, 21 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 7793956abf..0268700252 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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