[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-3' - loleaflet/Makefile.am

[Andras Timar (via logerrit)]

 loleaflet/Makefile.am |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 8b900164af6a940479c74a70f5fe0a3a54bccdf1
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed May 27 14:20:43 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed May 27 18:47:37 2020 +0200

    install the optional welcome text
    
    Change-Id: Ic3096110cab7068d7963056fab1002db4fc8451e
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94951
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index bfebbbf45..18ca861ed 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -46,6 +46,9 @@ endif
 LOLEAFLET_HTML_SRC = $(shell find $(srcdir)/html -name '*.html')
 LOLEAFLET_HTML_DST = $(patsubst $(srcdir)/html/%.html,$(DIST_FOLDER)/%.html,$(LOLEAFLET_HTML_SRC))
 
+LOLEAFLET_WELCOME_SRC = $(shell find $(srcdir)/welcome -name '*.html')
+LOLEAFLET_WELCOME_DST = $(patsubst $(srcdir)/welcome/%.html,$(DIST_FOLDER)/welcome/%.html,$(LOLEAFLET_WELCOME_SRC))
+
 LOLEAFLET_ADMIN_SRC = $(shell find $(srcdir)/admin -name '*.html')
 LOLEAFLET_ADMIN_ALL = $(shell find $(srcdir)/admin -name '*')
 LOLEAFLET_ADMIN_DST = $(patsubst $(srcdir)/admin/%,$(DIST_FOLDER)/admin/%,$(LOLEAFLET_ADMIN_SRC))
@@ -412,7 +415,7 @@ $(DIST_FOLDER)/bundle.js: $(NODE_MODULES_JS_SRC) \
 		--output $@
 endif
 
-$(DIST_FOLDER)/loleaflet.html: $(srcdir)/html/loleaflet.html.m4 $(LOLEAFLET_HTML_DST) $(DIST_FOLDER)/bundle.css $(DIST_FOLDER)/global.js \
+$(DIST_FOLDER)/loleaflet.html: $(srcdir)/html/loleaflet.html.m4 $(LOLEAFLET_HTML_DST) $(LOLEAFLET_WELCOME_DST) $(DIST_FOLDER)/bundle.css $(DIST_FOLDER)/global.js \
 \
 	$(DIST_FOLDER)/bundle.css $(DIST_FOLDER)/bundle.js
 	@echo "Generating loleaflet.html..."
@@ -465,6 +468,14 @@ $(DIST_FOLDER)/%.html: $(srcdir)/html/%.html
 		`ln -sf $(abs_srcdir)/$< $@`; \
 	fi
 
+$(DIST_FOLDER)/welcome/%.html: $(srcdir)/welcome/%.html
+	@mkdir -p $(dir $@)
+	@if test -z '$(ENABLE_BROWSERSYNC)'; then \
+		`cp $< $@`; \
+	else \
+		`ln -sf $(abs_srcdir)/$< $@`; \
+	fi
+
 $(DIST_FOLDER)/src/%.js: $(srcdir)/src/%.js
 	@mkdir -p $(dir $@)
 	@if test -z '$(ENABLE_BROWSERSYNC)'; then \