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

diff --git a/bin/ChangeLog b/bin/ChangeLog
index 8673130..f2e889a 100644 (file)
--- 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 c7e1b26..dc218fa 100755 (executable)
--- 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