From 27f29026c21478b81b3e21a5b5c549fde984fe7f Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 1 Feb 2011 18:04:21 +0000 Subject: [PATCH 1/2] Don't distribute generated files that embed our builddir Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30285 --- test/Makefile.am | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index 5fb8635..110e5dc 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -115,8 +115,17 @@ dist-hook: done ; \ FILES=`(cd $(srcdir) && $(FIND_TESTS) -o -name "*.in" -a -not -name Makefile.in | grep -Ev "(.svn|CVS)" )` ; \ for F in $$FILES; do \ - echo '-- Disting file '$$F ; \ - cp -f $(srcdir)/$$F $(distdir)/$$F || exit 1 ; \ + B=`basename $$F`; \ + if test -e $$F.in; then \ + echo "-- Skipping file $$F (.in version exists)"; \ + elif test "x$$B" = xrun-with-tmp-session-bus.conf; then \ + echo "-- Skipping file $$F (generated)"; \ + elif test -e "$(top_srcdir)/bus/$$B"; then \ + echo "-- Skipping file $$F (from /bus/)"; \ + else \ + echo '-- Disting file '$$F ; \ + cp -f $(srcdir)/$$F $(distdir)/$$F || exit 1; \ + fi; \ done ## copy tests to builddir so that generated tests and static tests -- 1.7.2.3