diff options
| author | Björn Gustavsson <[email protected]> | 2010-09-07 10:27:14 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2010-09-07 10:27:14 +0200 |
| commit | 03997d5a1c166e8470dd9c888a5dba121144986a (patch) | |
| tree | 76ef98d2fc2cf0588392b036be18d984072207c1 /lib/test_server | |
| parent | 4763e0b7b8c4859d9e56f1fc9aa1426eebc8f65d (diff) | |
| parent | 88a04a19d751c4c6712fc9b079e16d3976a4d731 (diff) | |
| download | otp-03997d5a1c166e8470dd9c888a5dba121144986a.tar.gz otp-03997d5a1c166e8470dd9c888a5dba121144986a.tar.bz2 otp-03997d5a1c166e8470dd9c888a5dba121144986a.zip | |
Merge branch 'mk/net-dragonfly-bsd-patches' into dev
* mk/net-dragonfly-bsd-patches:
Remove unused variables
Use proper install method
Add support for DragonFly BSD
Add support for NetBSD
Diffstat (limited to 'lib/test_server')
| -rw-r--r-- | lib/test_server/src/Makefile | 2 | ||||
| -rw-r--r-- | lib/test_server/test/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/test_server/src/Makefile b/lib/test_server/src/Makefile index d55a3a597d..3dca55178d 100644 --- a/lib/test_server/src/Makefile +++ b/lib/test_server/src/Makefile @@ -139,7 +139,7 @@ release_tests_spec: opt $(TARGET_FILES) $(TS_TARGET_FILES) \ $(AUTOCONF_FILES) $(C_FILES) $(COVER_FILES) $(CONFIG) \ $(RELEASE_PATH)/test_server - $(INSTALL_PROGRAM) $(PROGRAMS) $(RELEASE_PATH)/test_server + $(INSTALL_SCRIPT) $(PROGRAMS) $(RELEASE_PATH)/test_server release_docs_spec: diff --git a/lib/test_server/test/Makefile b/lib/test_server/test/Makefile index 702d73f5af..fcb1282d16 100644 --- a/lib/test_server/test/Makefile +++ b/lib/test_server/test/Makefile @@ -88,7 +88,7 @@ release_spec: opt release_tests_spec: make_emakefile $(INSTALL_DIR) $(RELSYSDIR) $(INSTALL_DATA) $(EMAKEFILE) $(ERL_FILES) $(COVERFILE) $(RELSYSDIR) - $(INSTALL_PROGRAM) test_server.spec $(RELSYSDIR) + $(INSTALL_DATA) test_server.spec $(RELSYSDIR) chmod -f -R u+w $(RELSYSDIR) @tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -) |