diff options
| author | Peter Williams <peterw@src.gnome.org> | 2000-08-01 17:47:27 +0000 |
|---|---|---|
| committer | Peter Williams <peterw@src.gnome.org> | 2000-08-01 17:47:27 +0000 |
| commit | 7d6db2c6a78e022880a0529021c4805cd3a051ae (patch) | |
| tree | 5820152cf309d9613a5550453822384bcea05482 | |
| parent | 75b1f38e28ac9f0813e6dc14c20dd885a7c802a7 (diff) | |
| download | shared-mime-info-7d6db2c6a78e022880a0529021c4805cd3a051ae.tar.gz | |
HEAD sync. Surprisingly painless.
svn path=/branches/camel-async/; revision=1344
| -rw-r--r-- | macros/Makefile.am | 4 | ||||
| -rw-r--r-- | macros/gnome-common.m4 | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/macros/Makefile.am b/macros/Makefile.am index cb7c1854..ed4b5fa1 100644 --- a/macros/Makefile.am +++ b/macros/Makefile.am @@ -24,7 +24,7 @@ MACROS= \ linger.m4 \ need-declaration.m4 -EXTRA_DIST=$(MACROS) gnome-common.m4 gnome-gettext.m4 autogen.sh +EXTRA_DIST=$(MACROS) gnome-common.m4 autogen.sh MAINTAINERCLEANFILES=macros.dep @MAINT@macros.dep: Makefile.am @@ -37,6 +37,6 @@ gnome-macros.dep: Makefile.am @echo '$$(top_srcdir)/aclocal.m4: $(MACROS:%=$(gnome_aclocaldir)/%)' > $@ gnome_aclocal_DATA = $(MACROS) gnome-macros.dep gnome-common.m4 \ - gnome-gettext.m4 autogen.sh + autogen.sh endif diff --git a/macros/gnome-common.m4 b/macros/gnome-common.m4 index b6be9eb4..83bb00d7 100644 --- a/macros/gnome-common.m4 +++ b/macros/gnome-common.m4 @@ -6,9 +6,9 @@ dnl GNOME_COMMON_INIT AC_DEFUN([GNOME_COMMON_INIT], [ - GNOME_ACLOCAL_DIR=`$ACLOCAL --print-ac-dir`/gnome-macros + GNOME_ACLOCAL_DIR="$GNOME_COMMON_MACROS_DIR" AC_SUBST(GNOME_ACLOCAL_DIR) - ACLOCAL="$ACLOCAL -I $GNOME_ACLOCAL_DIR" + ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" ]) |