git.mk | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
New commits: commit 6b4fdded94b7efb96c6e41cca4350878ed859ff1 Author: Behdad Esfahbod <[email protected]> Date: Mon Sep 30 13:48:19 2013 -0400 Update git.mk diff --git a/git.mk b/git.mk index 2fa799d..b19bd33 100644 --- a/git.mk +++ b/git.mk @@ -89,6 +89,7 @@ GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \ ltmain.sh \ missing \ mkinstalldirs \ + test-driver \ ; do echo "$$AUX_DIR/$$x"; done` \ `cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1' ./configure.ac | \ head -n 1 | while read f; do echo "$(srcdir)/$$f.in"; done` @@ -102,14 +103,19 @@ GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN = \ test -f "$(srcdir)/$$f.am" && echo "$(srcdir)/$$f.in";; esac; \ done` # -# Modules that use libtool /and/ use AC_CONFIG_MACRO_DIR([m4]) may also -# include this: +# Modules that use libtool and use AC_CONFIG_MACRO_DIR() may also include this, +# though it's harmless to include regardless. GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL = \ - $(srcdir)/m4/libtool.m4 \ - $(srcdir)/m4/ltoptions.m4 \ - $(srcdir)/m4/ltsugar.m4 \ - $(srcdir)/m4/ltversion.m4 \ - $(srcdir)/m4/lt~obsolete.m4 + `MACRO_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_MACRO_DIR:$$1' ./configure.ac); \ + if test "x$$MACRO_DIR" != "x$(srcdir)/"; then \ + for x in \ + libtool.m4 \ + ltoptions.m4 \ + ltsugar.m4 \ + ltversion.m4 \ + lt~obsolete.m4 \ + ; do echo "$$MACRO_DIR/$$x"; done; \ + fi` _______________________________________________ HarfBuzz mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/harfbuzz
