diff options
| author | Martin Baulig <martin@src.gnome.org> | 2000-07-24 15:55:43 +0000 |
|---|---|---|
| committer | Martin Baulig <martin@src.gnome.org> | 2000-07-24 15:55:43 +0000 |
| commit | 80a465e548278e727aee556eab719e70979435b0 (patch) | |
| tree | ecce253323c89da3e91cb1fe917b1dc2eb26fe8e | |
| parent | fcb53c1f2bdff3fca797edeef17a147de4c8a836 (diff) | |
| download | gnome-common-80a465e548278e727aee556eab719e70979435b0.tar.gz | |
Don't use gnome-config if GNOME_DATADIR is set.
svn path=/trunk/; revision=1317
| -rwxr-xr-x | bin/gnome-autogen.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bin/gnome-autogen.sh b/bin/gnome-autogen.sh index 831054b..c7e1b26 100755 --- a/bin/gnome-autogen.sh +++ b/bin/gnome-autogen.sh @@ -1,9 +1,13 @@ #!/bin/sh +if test -z "$GNOME_DATADIR" ; then + GNOME_DATADIR=`gnome-config --datadir` +fi + if test -n "$USE_GNOME2_MACROS" ; then - export GNOME_COMMON_MACROS_DIR=`gnome-config --datadir`/aclocal/gnome2-macros + export GNOME_COMMON_MACROS_DIR="$GNOME_DATADIR/aclocal/gnome2-macros" else - export GNOME_COMMON_MACROS_DIR=`gnome-config --datadir`/aclocal/gnome-macros + export GNOME_COMMON_MACROS_DIR="$GNOME_DATADIR/aclocal/gnome-macros" fi export ACLOCAL_FLAGS="-I $GNOME_COMMON_MACROS_DIR $ACLOCAL_FLAGS" |