diff options
| author | Micael Karlberg <[email protected]> | 2010-11-10 16:47:39 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2010-11-10 16:47:39 +0100 |
| commit | 360b932a2e3b0f4556f838612a031f62b845f0fb (patch) | |
| tree | ac8b0df162b37fa51ef6ec56b48241704eeeffdc /lib/inets/test/Makefile | |
| parent | 033584eab11944fa8e3c2b55747cce887cd98877 (diff) | |
| download | otp-360b932a2e3b0f4556f838612a031f62b845f0fb.tar.gz otp-360b932a2e3b0f4556f838612a031f62b845f0fb.tar.bz2 otp-360b932a2e3b0f4556f838612a031f62b845f0fb.zip | |
New behaviour for ipv6 machines.
As the web-server uses the option ipfamily
with value, inet6fb4, so should the client.
Also some make cleanup (testing for TAR.exclude
in data dirs before using).
Header in vsn.mk file also missing for some reason!
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 |