From f243e2d932512d97d6f1f66eb54e6bf3d6e96051 Mon Sep 17 00:00:00 2001 From: Xavier Guimard Date: Mon, 24 Oct 2016 19:57:35 +0000 Subject: [PATCH] Remove js (#1096) --- Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Makefile b/Makefile index 9afd4dd26..2782d7e09 100644 --- a/Makefile +++ b/Makefile @@ -168,6 +168,8 @@ PORTALLIBSTOREMOVEFORDEBIAN=$(RPORTALSKINSDIR)/bootstrap/fonts \ $(RPORTALSKINSDIR)/bootstrap/js/bootstrap* \ $(RPORTALSKINSDIR)/common/js/jquery-* \ $(RPORTALSKINSDIR)/common/js/jquery.cookie* +DOCLIBSTOREMOVEFORDEBIAN=doc/pages/documentation/current/lib/tpl/bootstrap3 +DOCEXTERNALLIBS=$(DOCLIBSTOREMOVEFORDEBIAN) MANAGEREXTERNALLIBS=$(RMANAGERSTATICDIR)/bwr/ PORTALEXTERNALLIBS=$(PORTALLIBSTOREMOVEFORDEBIAN) $(RPORTALSKINSDIR)/common/js/jquery* @@ -722,6 +724,12 @@ install_doc_site: done && cd - # Install symlinks @cd doc && tar cf - `find * -type l` | tar xvf - -C $(RDEFDOCDIR) && cd - + # Remove js + @if test "$(USEEXTERNALLIBS)" = "yes"; then \ + rm -rvf $(DOCEXTERNALLIBS); \ + elif test "$(USEDEBIANLIBS)" = "yes"; then \ + rm -rvf $(DOCLIBSTOREMOVEFORDEBIAN); \ + fi install_conf_dir: install_sessions_dir install_notif_dir install_captcha_dir # Configuration files install