From: Martin Baulig Date: Mon, 20 Nov 2000 16:26:49 +0000 (+0000) Subject: Initialize GNOME_DATADIR from GNOME_DIR if set before trying gnome-config. X-Git-Tag: GNOME_COMMON_1_2_1~14 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9ffde11a5911f86986633acce99cd6a0f40af1a5;p=platform%2Fupstream%2Fgnome-common.git Initialize GNOME_DATADIR from GNOME_DIR if set before trying gnome-config. 2000-11-20 Martin Baulig * gnome-autogen.sh: Initialize GNOME_DATADIR from GNOME_DIR if set before trying gnome-config. svn path=/trunk/; revision=1462 --- diff --git a/bin/ChangeLog b/bin/ChangeLog index 8673130..f2e889a 100644 --- a/bin/ChangeLog +++ b/bin/ChangeLog @@ -1,3 +1,8 @@ +2000-11-20 Martin Baulig + + * gnome-autogen.sh: Initialize GNOME_DATADIR from + GNOME_DIR if set before trying gnome-config. + 2000-05-29 Martin Baulig * gnome-autogen.sh: New file. Moved here from diff --git a/bin/gnome-autogen.sh b/bin/gnome-autogen.sh index c7e1b26..dc218fa 100755 --- a/bin/gnome-autogen.sh +++ b/bin/gnome-autogen.sh @@ -1,7 +1,11 @@ #!/bin/sh if test -z "$GNOME_DATADIR" ; then - GNOME_DATADIR=`gnome-config --datadir` + if test -z "$GNOME_DIR" ; then + GNOME_DATADIR=`gnome-config --datadir` + else + GNOME_DATADIR="$GNOME_DIR/share" + fi fi if test -n "$USE_GNOME2_MACROS" ; then