diff options
| author | Peter Andersson <[email protected]> | 2011-11-18 15:23:09 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2011-11-18 15:23:32 +0100 |
| commit | 42213c86c2317f4c89bac62ec1abc7cf0d815f01 (patch) | |
| tree | 38326058d513e4ba67988158c83c452c9fcd20de /lib/common_test/priv/Makefile.in | |
| parent | b58c308e3afac1ba0636a9c0b93680bf3b0ec0bd (diff) | |
| parent | fd55862c24edbb47e7c632395d21bd1aeefd6d42 (diff) | |
| download | otp-42213c86c2317f4c89bac62ec1abc7cf0d815f01.tar.gz otp-42213c86c2317f4c89bac62ec1abc7cf0d815f01.tar.bz2 otp-42213c86c2317f4c89bac62ec1abc7cf0d815f01.zip | |
Merge branch 'peppe/common_test/css_and_xhtml'
* peppe/common_test/css_and_xhtml:
Make absolute paths in log files relative
Fix bad error printout
Copy default CSS file to log directory before test run
Add CSS stylesheet for the text and tables in Common Test and Test Server
OTP-9706
Diffstat (limited to 'lib/common_test/priv/Makefile.in')
| -rw-r--r-- | lib/common_test/priv/Makefile.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/common_test/priv/Makefile.in b/lib/common_test/priv/Makefile.in index f4a0c181f9..d9033f6ef1 100644 --- a/lib/common_test/priv/Makefile.in +++ b/lib/common_test/priv/Makefile.in @@ -59,6 +59,7 @@ ifneq ($(findstring win32,$(TARGET)),win32) FILES = vts.tool SCRIPTS = IMAGES = tile1.jpg +CSS = ct_default.css # # Rules @@ -85,11 +86,11 @@ include $(ERL_TOP)/make/otp_release_targets.mk ifeq ($(XNIX),true) release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/priv - $(INSTALL_DATA) $(FILES) $(IMAGES) $(RELSYSDIR)/priv + $(INSTALL_DATA) $(FILES) $(IMAGES) $(CSS) $(RELSYSDIR)/priv else release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/priv - $(INSTALL_DATA) $(FILES) $(IMAGES) $(RELSYSDIR)/priv + $(INSTALL_DATA) $(FILES) $(IMAGES) $(CSS) $(RELSYSDIR)/priv endif release_docs_spec: @@ -105,6 +106,7 @@ else # FILES = vts.tool IMAGES = tile1.jpg +CSS = ct_default.css # # Rules @@ -124,7 +126,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/priv - $(INSTALL_DATA) $(FILES) $(IMAGES) $(RELSYSDIR)/priv + $(INSTALL_DATA) $(FILES) $(IMAGES) $(CSS) $(RELSYSDIR)/priv release_docs_spec: |