Merge branch 'community'

[ipfire.org.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index be16ecf8274d46eee26c323568efbc1c4929bb2b..fcbfd0d77bf0134ea9dfd94c39fe3ad5369e0cf9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -113,6 +113,9 @@ templates_auth_DATA = \
        src/templates/auth/activate.html \
        src/templates/auth/activated.html \
        src/templates/auth/login.html \
+       src/templates/auth/password-reset.html \
+       src/templates/auth/password-reset-initiation.html \
+       src/templates/auth/password-reset-successful.html \
        src/templates/auth/register.html \
        src/templates/auth/register-spam.html \
        src/templates/auth/register-success.html
@@ -120,6 +123,7 @@ templates_auth_DATA = \
 templates_authdir = $(templatesdir)/auth
 
 templates_auth_messages_DATA = \
+       src/templates/auth/messages/password-reset.txt \
        src/templates/auth/messages/register.txt
 
 templates_auth_messagesdir = $(templates_authdir)/messages
@@ -209,6 +213,7 @@ templates_netboot_DATA = \
 templates_netbootdir = $(templatesdir)/netboot
 
 templates_newsletter_DATA = \
+       src/templates/newsletter/subscribe.txt \
        src/templates/newsletter/subscribed.html
 
 templates_newsletterdir = $(templatesdir)/newsletter
@@ -229,6 +234,8 @@ templates_people_DATA = \
        src/templates/people/conferences.html \
        src/templates/people/call.html \
        src/templates/people/calls.html \
+       src/templates/people/group.html \
+       src/templates/people/groups.html \
        src/templates/people/index.html \
        src/templates/people/passwd.html \
        src/templates/people/search.html \
@@ -257,15 +264,6 @@ templates_people_modules_DATA = \
 
 templates_people_modulesdir = $(templates_peopledir)/modules
 
-templates_people_ssh_keys_DATA = \
-       src/templates/people/ssh-keys/delete.html \
-       src/templates/people/ssh-keys/error.html \
-       src/templates/people/ssh-keys/error-invalid-key.html \
-       src/templates/people/ssh-keys/index.html \
-       src/templates/people/ssh-keys/upload.html
-
-templates_people_ssh_keysdir = $(templates_peopledir)/ssh-keys
-
 templates_static_DATA = \
        src/templates/static/blocked.html \
        src/templates/static/features.html \