add some code to add the directory given to AC_CONFIG_MACRO_DIR to

2005-01-03  James Henstridge  <james@jamesh.id.au>

	* macros2/gnome-common.m4 (GNOME_COMMON_INIT): add some code to
	add the directory given to AC_CONFIG_MACRO_DIR to ACLOCAL_FLAGS.

	* doc-build/xmldocs.make (clean-local-doc): add rule to clean up
	copied entities if srcdir!=builddir.

svn path=/trunk/; revision=3486

diff --git a/ChangeLog b/ChangeLog
index 07ced4c..251ae17 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-03  James Henstridge  <james@jamesh.id.au>
+
+       * macros2/gnome-common.m4 (GNOME_COMMON_INIT): add some code to
+       add the directory given to AC_CONFIG_MACRO_DIR to ACLOCAL_FLAGS.
+
+       * doc-build/xmldocs.make (clean-local-doc): add rule to clean up
+       copied entities if srcdir!=builddir.
+
 2004-10-06  James Henstridge  <james@jamesh.id.au>
 
        * doc-build/omf.make (uninstall-local-omf): use $(DESTDIR) in

diff --git a/doc-build/xmldocs.make b/doc-build/xmldocs.make
index 84d0f2b..b93e3f3 100644 (file)
--- a/doc-build/xmldocs.make
+++ b/doc-build/xmldocs.make
@@ -92,4 +92,10 @@ uninstall-local-doc:
        done
        -rmdir $(DESTDIR)$(docdir)
 
-clean-local: clean-local-omf
+clean-local: clean-local-doc clean-local-omf
+
+# for non-srcdir builds, remove the copied entities.
+clean-local-doc:
+       if test $(srcdir) != .; then \
+         rm -f $(entities); \
+       fi

diff --git a/macros2/gnome-common.m4 b/macros2/gnome-common.m4
index 8f296b6..e4747e9 100644 (file)
--- a/macros2/gnome-common.m4
+++ b/macros2/gnome-common.m4
@@ -5,9 +5,16 @@ dnl GNOME_COMMON_INIT
 
 AC_DEFUN([GNOME_COMMON_INIT],
 [
+  dnl this macro should come after AC_CONFIG_MACRO_DIR
+  AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
+
   dnl ensure that when the Automake generated makefile calls aclocal,
   dnl it honours the $ACLOCAL_FLAGS environment variable
   ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
+  if test -n "$ac_macro_dir"; then
+    ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
+  fi
+
   AC_SUBST([ACLOCAL_AMFLAGS])
 ])