Update font-awesome to 5.11.2

[ipfire.org.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 35ddbf539b3d53946d8d7dab8e9ad46e9bd77285..d51e3c6b1c4796ead72df60a6686846319e25abf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ AUTOMAKE_OPTIONS = color-tests
 # keep itermediate files
 .SECONDARY:
 
-pythondir  = $(pyexecdir)
+pythondir  = $(prefix)/lib/python3/dist-packages
 
 configsdir = $(sysconfdir)/ipfire.org
 crondir    = $(sysconfdir)/cron.d
@@ -114,6 +114,7 @@ templates_auth_DATA = \
        src/templates/auth/activated.html \
        src/templates/auth/login.html \
        src/templates/auth/register.html \
+       src/templates/auth/register-spam.html \
        src/templates/auth/register-success.html
 
 templates_authdir = $(templatesdir)/auth
@@ -236,8 +237,14 @@ templates_people_DATA = \
 
 templates_peopledir = $(templatesdir)/people
 
+templates_people_messages_DATA = \
+       src/templates/people/messages/new-account.txt
+
+templates_people_messagesdir = $(templates_peopledir)/messages
+
 templates_people_modules_DATA = \
        src/templates/people/modules/accounts-list.html \
+       src/templates/people/modules/accounts-new.html \
        src/templates/people/modules/cdr.html \
        src/templates/people/modules/channels.html \
        src/templates/people/modules/mos.html \
@@ -269,6 +276,8 @@ templates_staticdir = $(templatesdir)/static
 templates_wiki_DATA = \
        src/templates/wiki/404.html \
        src/templates/wiki/base.html \
+       src/templates/wiki/confirm-delete.html \
+       src/templates/wiki/confirm-restore.html \
        src/templates/wiki/diff.html \
        src/templates/wiki/edit.html \
        src/templates/wiki/page.html \
@@ -868,21 +877,21 @@ static_fonts_DATA = \
        src/fonts/ofl/mukta/Mukta-Regular.ttf \
        src/fonts/ofl/mukta/Mukta-SemiBold.ttf \
        \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-brands-400.eot \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-brands-400.svg \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-brands-400.ttf \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-brands-400.woff \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-brands-400.woff2 \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-regular-400.eot \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-regular-400.svg \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-regular-400.ttf \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-regular-400.woff \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-regular-400.woff2 \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-solid-900.eot \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-solid-900.svg \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-solid-900.ttf \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-solid-900.woff \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-solid-900.woff2 \
+       src/font-awesome/webfonts/fa-brands-400.eot \
+       src/font-awesome/webfonts/fa-brands-400.svg \
+       src/font-awesome/webfonts/fa-brands-400.ttf \
+       src/font-awesome/webfonts/fa-brands-400.woff \
+       src/font-awesome/webfonts/fa-brands-400.woff2 \
+       src/font-awesome/webfonts/fa-regular-400.eot \
+       src/font-awesome/webfonts/fa-regular-400.svg \
+       src/font-awesome/webfonts/fa-regular-400.ttf \
+       src/font-awesome/webfonts/fa-regular-400.woff \
+       src/font-awesome/webfonts/fa-regular-400.woff2 \
+       src/font-awesome/webfonts/fa-solid-900.eot \
+       src/font-awesome/webfonts/fa-solid-900.svg \
+       src/font-awesome/webfonts/fa-solid-900.ttf \
+       src/font-awesome/webfonts/fa-solid-900.woff \
+       src/font-awesome/webfonts/fa-solid-900.woff2 \
        \
        src/payment-font/fonts/paymentfont-webfont.eot \
        src/payment-font/fonts/paymentfont-webfont.svg \
@@ -924,6 +933,7 @@ static_js_DATA = \
        src/bootstrap/dist/js/bootstrap.min.js \
        src/bootstrap/dist/js/bootstrap.min.js.map \
        \
+       src/static/js/editor.js \
        src/static/js/jquery-3.3.1.min.js \
        src/static/js/popper.min.js \
        src/static/js/popper.min.js.map \
@@ -947,7 +957,7 @@ static_netbootdir = $(staticdir)/netboot
 # ------------------------------------------------------------------------------
 
 dist_cron_DATA = \
-       src/crontab/ipfire.org
+       src/crontab/ipfire
 
 # ------------------------------------------------------------------------------
 
@@ -1013,6 +1023,10 @@ src/static/img/apple-touch-icon-%-precomposed.png: src/static/img/ipfire-tux.png
                -extent $(patsubst src/static/img/apple-touch-icon-%-precomposed.png,%,$@)x$(patsubst src/static/img/apple-touch-icon-%-precomposed.png,%,$@) \
                $< $@
 
+.PHONY: update
+update:
+       for i in src/systemd/ipfire.org-webapp-*.service; do systemctl restart $$(basename $${i}) && sleep 5; done
+
 # Docker
 .PHONY: docker
 docker: Dockerfile