diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-02-01 18:04:21 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-02-01 18:04:21 +0000 |
| commit | 27f29026c21478b81b3e21a5b5c549fde984fe7f (patch) | |
| tree | d89f8cec8656f4c8eceab0df15ae16e56019e061 | |
| parent | 3a380137c0f342585b9259b5d005c89d89a2e8b5 (diff) | |
Don't distribute generated files that embed our builddir
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30285
| -rw-r--r-- | test/Makefile.am | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 5fb86357..110e5dc3 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 |