diff options
| author | Ingela Anderton Andin <[email protected]> | 2010-11-29 15:42:52 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2010-11-29 15:42:52 +0100 |
| commit | e4890b3b1a94c66f624d11e901977dfc76883808 (patch) | |
| tree | c5d19bb4379180d5ebf4b62c12cb5e7fde908ec4 /lib/inets/test/Makefile | |
| parent | 97a68f5fcf1bd89766905078a805e3058848130c (diff) | |
| parent | ad82371b4b6e3c0c1bf29f0a03e8e07941ffacc4 (diff) | |
| download | otp-e4890b3b1a94c66f624d11e901977dfc76883808.tar.gz otp-e4890b3b1a94c66f624d11e901977dfc76883808.tar.bz2 otp-e4890b3b1a94c66f624d11e901977dfc76883808.zip | |
Merge branch 'bmk/httpc_suite_ipfamily_fix/20101109/OTP-8927' of super:bmk_otp into dev
Diffstat (limited to 'lib/inets/test/Makefile')
| -rw-r--r-- | lib/inets/test/Makefile | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/lib/inets/test/Makefile b/lib/inets/test/Makefile index bb7f2186af..0492d33eab 100644 --- a/lib/inets/test/Makefile +++ b/lib/inets/test/Makefile @@ -288,16 +288,20 @@ release_spec: opt $(INSTALL_DATA) $(INETS_FILES) $(RELSYSDIR)/test @for d in $(DATADIRS); do \ echo "installing data dir $$d"; \ - echo $$d/TAR.exclude2 > $$d/TAR.exclude2; \ - cat $$d/TAR.exclude >> $$d/TAR.exclude2; \ - find $$d -name '*.contrib*' >> $$d/TAR.exclude2; \ - find $$d -name '*.keep*' >> $$d/TAR.exclude2; \ - find $$d -name '*.mkelem*' >> $$d/TAR.exclude2; \ - find $$d -name '*~' >> $$d/TAR.exclude2; \ - find $$d -name 'erl_crash.dump' >> $$d/TAR.exclude2; \ - find $$d -name 'core' >> $$d/TAR.exclude2; \ - find $$d -name '.cmake.state' >> $$d/TAR.exclude2; \ - tar cfX - $$d/TAR.exclude2 $$d | (cd $(RELSYSDIR)/test; tar xf -); \ + if test -f $$d/TAR.exclude; then \ + echo $$d/TAR.exclude2 > $$d/TAR.exclude2; \ + cat $$d/TAR.exclude >> $$d/TAR.exclude2; \ + find $$d -name '*.contrib*' >> $$d/TAR.exclude2; \ + find $$d -name '*.keep*' >> $$d/TAR.exclude2; \ + find $$d -name '*.mkelem*' >> $$d/TAR.exclude2; \ + find $$d -name '*~' >> $$d/TAR.exclude2; \ + find $$d -name 'erl_crash.dump' >> $$d/TAR.exclude2; \ + find $$d -name 'core' >> $$d/TAR.exclude2; \ + find $$d -name '.cmake.state' >> $$d/TAR.exclude2; \ + tar cfX - $$d/TAR.exclude2 $$d | (cd $(RELSYSDIR)/test; tar xf -); \ + else \ + tar cf - $$d | (cd $(RELSYSDIR)/test; tar xf -); \ + fi; \ done release_tests_spec: opt |