diff options
author | Martin Baulig <baulig@suse.de> | 2000-05-29 15:17:17 +0000 |
---|---|---|
committer | Martin Baulig <martin@src.gnome.org> | 2000-05-29 15:17:17 +0000 |
commit | 2613833d16d0319d36165a1dc9fa283aaf0c0d7e (patch) | |
tree | 9bb5ae555e7da1e09b9b2a48b72cc1a148c396cc | |
parent | 7d133ecfaf798c274fa0fb978364fe45771fa0ba (diff) | |
download | gnome-common-2613833d16d0319d36165a1dc9fa283aaf0c0d7e.tar.gz |
If `USE_GNOME_2_MACROS' is set, use the GNOME 2.0 macros from the
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.
svn path=/trunk/; revision=1254
-rw-r--r-- | macros/ChangeLog | 5 | ||||
-rwxr-xr-x | macros/gnome-autogen.sh | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog index 4161f8f..ea24923 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 33d98a6..c667827 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 |