diff options
| author | Peter Andersson <[email protected]> | 2012-08-23 15:50:28 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2012-08-23 15:50:46 +0200 |
| commit | d961f2d397584e2fa8c6da4b2d6fa495803a7065 (patch) | |
| tree | 0112e99ae2b35cd6caa25f56188522601231856b /lib/common_test/priv/Makefile.in | |
| parent | 69c3f5994342bd60ee43402b6c91f87b58f89b8b (diff) | |
| parent | e654efdc00b7ed658de589faab6df0f67b2b62e7 (diff) | |
| download | otp-d961f2d397584e2fa8c6da4b2d6fa495803a7065.tar.gz otp-d961f2d397584e2fa8c6da4b2d6fa495803a7065.tar.bz2 otp-d961f2d397584e2fa8c6da4b2d6fa495803a7065.zip | |
Merge branch 'peppe/common_test/table_sorter' into maint
* peppe/common_test/table_sorter:
Fix installation of javascript files on windows
Fix installation of javascript files
Make it possible to sort the HTML tables
Conflicts:
lib/common_test/src/ct_util.hrl
OTP-9896
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 8be6248e17..2f06f7df65 100644 --- a/lib/common_test/priv/Makefile.in +++ b/lib/common_test/priv/Makefile.in @@ -60,6 +60,7 @@ FILES = vts.tool SCRIPTS = IMAGES = tile1.jpg CSS = ct_default.css +JS = jquery-latest.js jquery.tablesorter.min.js # # Rules @@ -86,11 +87,11 @@ include $(ERL_TOP)/make/otp_release_targets.mk ifeq ($(XNIX),true) release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/priv" - $(INSTALL_DATA) $(FILES) $(IMAGES) $(CSS) "$(RELSYSDIR)/priv" + $(INSTALL_DATA) $(FILES) $(IMAGES) $(CSS) $(JS) "$(RELSYSDIR)/priv" else release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/priv" - $(INSTALL_DATA) $(FILES) $(IMAGES) $(CSS) "$(RELSYSDIR)/priv" + $(INSTALL_DATA) $(FILES) $(IMAGES) $(CSS) $(JS) "$(RELSYSDIR)/priv" endif release_docs_spec: @@ -107,6 +108,7 @@ else FILES = vts.tool IMAGES = tile1.jpg CSS = ct_default.css +JS = jquery-latest.js jquery.tablesorter.min.js # # Rules @@ -126,7 +128,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/priv" - $(INSTALL_DATA) $(FILES) $(IMAGES) $(CSS) "$(RELSYSDIR)/priv" + $(INSTALL_DATA) $(FILES) $(IMAGES) $(CSS) $(JS) "$(RELSYSDIR)/priv" release_docs_spec: |