aboutsummaryrefslogtreecommitdiffstats
path: root/macros
diff options
context:
space:
mode:
Diffstat (limited to 'macros')
-rw-r--r--macros/ChangeLog5
-rwxr-xr-xmacros/gnome-autogen.sh7
2 files changed, 11 insertions, 1 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index 4161f8f513..ea24923740 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,5 +1,10 @@
2000-05-29 Martin Baulig <baulig@suse.de>
+ * gnome-autogen.sh: If `USE_GNOME_2_MACROS' is set, use the
+ GNOME 2.0 macros from the `macros2' directory.
+
+2000-05-29 Martin Baulig <baulig@suse.de>
+
* gnome-common.m4, Makefile.am: Install macros to
`$(datadir)/aclocal/gnome-macros' when INSIDE_GNOME_COMMON.
diff --git a/macros/gnome-autogen.sh b/macros/gnome-autogen.sh
index 33d98a62f0..c667827a0f 100755
--- a/macros/gnome-autogen.sh
+++ b/macros/gnome-autogen.sh
@@ -1,6 +1,11 @@
#!/bin/sh
-export GNOME_COMMON_MACROS_DIR=`gnome-config --datadir`/aclocal/gnome-macros
+if test -n "$USE_GNOME_2_MACROS" ; then
+ export GNOME_COMMON_MACROS_DIR=`gnome-config --datadir`/aclocal/gnome2-macros
+else
+ export GNOME_COMMON_MACROS_DIR=`gnome-config --datadir`/aclocal/gnome-macros
+fi
+
export ACLOCAL_FLAGS="-I $GNOME_COMMON_MACROS_DIR $ACLOCAL_FLAGS"
. $GNOME_COMMON_MACROS_DIR/autogen.sh