diff options
| author | James Henstridge <james@jamesh.id.au> | 2005-01-03 09:27:36 +0000 |
|---|---|---|
| committer | James Henstridge <jamesh@src.gnome.org> | 2005-01-03 09:27:36 +0000 |
| commit | 83c1ee7944624c0cd45eda8155d1dc232f4d620b (patch) | |
| tree | bfbb6c823ec9fcd7b6144384846047def62f0d8b | |
| parent | f9c955f0dffb1e5dec532970b9b0c9d4798584d1 (diff) | |
| download | gnome-common-83c1ee7944624c0cd45eda8155d1dc232f4d620b.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | doc-build/xmldocs.make | 8 | ||||
| -rw-r--r-- | macros2/gnome-common.m4 | 7 |
3 files changed, 22 insertions, 1 deletions
@@ -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 --- 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 --- 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]) ]) |