From 80a465e548278e727aee556eab719e70979435b0 Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Mon, 24 Jul 2000 15:55:43 +0000 Subject: [PATCH] Don't use gnome-config if GNOME_DATADIR is set. svn path=/trunk/; revision=1317 --- bin/gnome-autogen.sh | 8 ++++++-- 1 file 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" -- 2.7.4