From 2613833d16d0319d36165a1dc9fa283aaf0c0d7e Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Mon, 29 May 2000 15:17:17 +0000 Subject: If `USE_GNOME_2_MACROS' is set, use the GNOME 2.0 macros from the 2000-05-29 Martin Baulig * gnome-autogen.sh: If `USE_GNOME_2_MACROS' is set, use the GNOME 2.0 macros from the `macros2' directory. svn path=/trunk/; revision=1254 --- macros/ChangeLog | 5 +++++ macros/gnome-autogen.sh | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/macros/ChangeLog b/macros/ChangeLog index 4161f8f5..ea249237 100644 --- a/macros/ChangeLog +++ b/macros/ChangeLog @@ -1,3 +1,8 @@ +2000-05-29 Martin Baulig + + * 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 * gnome-common.m4, Makefile.am: Install macros to diff --git a/macros/gnome-autogen.sh b/macros/gnome-autogen.sh index 33d98a62..c667827a 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 -- cgit v1.2.1