diff options
| author | Andras Timar <andras.timar@collabora.com> | 2020-06-03 23:06:01 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-06-03 23:06:42 +0200 |
| commit | 35afa33319f68363fb60458628404fb7e9e973da (patch) | |
| tree | 162e7e03dfd4bdda7b8c90d993c44a244cc62a0e | |
| parent | 2045a506fd6be4b848580f7ba6b53ac71339a823 (diff) | |
Revert "install the optional welcome text"distro/collabora/co-4-2-3
This reverts commit 8b900164af6a940479c74a70f5fe0a3a54bccdf1.
We don't need this in co-4-2-3 branch.
Change-Id: I6f4206661200f2eb4f6f33c5b6d86064b0a573cd
| -rw-r--r-- | loleaflet/Makefile.am | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am index 18ca861ed..bfebbbf45 100644 --- a/loleaflet/Makefile.am +++ b/loleaflet/Makefile.am @@ -46,9 +46,6 @@ 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)) @@ -415,7 +412,7 @@ $(DIST_FOLDER)/bundle.js: $(NODE_MODULES_JS_SRC) \ --output $@ endif -$(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)/loleaflet.html: $(srcdir)/html/loleaflet.html.m4 $(LOLEAFLET_HTML_DST) $(DIST_FOLDER)/bundle.css $(DIST_FOLDER)/global.js \ \ $(DIST_FOLDER)/bundle.css $(DIST_FOLDER)/bundle.js @echo "Generating loleaflet.html..." @@ -468,14 +465,6 @@ $(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 \ |