diff options
| author | Martin Baulig <baulig@suse.de> | 2000-11-20 16:26:49 +0000 |
|---|---|---|
| committer | Martin Baulig <martin@src.gnome.org> | 2000-11-20 16:26:49 +0000 |
| commit | 9ffde11a5911f86986633acce99cd6a0f40af1a5 (patch) | |
| tree | ebd0c78110db719148300048008ad7e895ece781 | |
| parent | 38f93f79e6a4ad79c2f94ccc4f3605d320128e62 (diff) | |
| download | shared-mime-info-9ffde11a5911f86986633acce99cd6a0f40af1a5.tar.gz | |
Initialize GNOME_DATADIR from GNOME_DIR if set before trying gnome-config.
2000-11-20 Martin Baulig <baulig@suse.de>
* gnome-autogen.sh: Initialize GNOME_DATADIR from
GNOME_DIR if set before trying gnome-config.
svn path=/trunk/; revision=1462
| -rw-r--r-- | bin/ChangeLog | 5 | ||||
| -rwxr-xr-x | bin/gnome-autogen.sh | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/bin/ChangeLog b/bin/ChangeLog index 8673130c..f2e889ab 100644 --- a/bin/ChangeLog +++ b/bin/ChangeLog @@ -1,3 +1,8 @@ +2000-11-20 Martin Baulig <baulig@suse.de> + + * gnome-autogen.sh: Initialize GNOME_DATADIR from + GNOME_DIR if set before trying gnome-config. + 2000-05-29 Martin Baulig <baulig@suse.de> * gnome-autogen.sh: New file. Moved here from diff --git a/bin/gnome-autogen.sh b/bin/gnome-autogen.sh index c7e1b266..dc218fa2 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 |