CSS: Create a CSS file that just delivers our fonts

[ipfire.org.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f382c7506dad4978168f4a52db41940c8c2a80c9..d74cbb6a728a3f8734fa2d9e80afbfbaf61bdd50 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -378,6 +378,7 @@ SASS_FILES = \
        src/sass/_variables.sass
 
 EXTRA_DIST += \
+       src/sass/fonts.sass \
        src/sass/listing.sass \
        src/templates/messages/fonts.sass \
        src/templates/messages/main.sass
@@ -390,11 +391,13 @@ static_DATA = \
        src/static/favicon.ico \
        src/static/robots.txt \
        src/sass/listing.css \
-       src/sass/main.css
+       src/sass/main.css \
+       src/sass/fonts.css
 
 CLEANFILES += \
        src/sass/listing.css \
-       src/sass/main.css
+       src/sass/main.css \
+       src/sass/fonts.css
 
 EXTRA_DIST += \
        $(SASS_FILES)
@@ -1072,8 +1075,8 @@ EXTRA_DIST += \
        src/error-pages/Gemfile \
        src/error-pages/Gemfile.lock \
        src/error-pages/_config.yml \
-       src/error-pages/_includes/main.sass \
        src/error-pages/_layouts/error.html \
+       src/error-pages/assets/main.sass \
        src/error-pages/500.markdown \
        src/error-pages/502.markdown \
        src/error-pages/503.markdown \
@@ -1081,11 +1084,13 @@ EXTRA_DIST += \
 
 .PHONY: error-pages
 error-pages:
-       $(AM_V_GEN)cd src/error-pages && $(JEKYLL) build --quiet --incremental
+       $(AM_V_GEN)cd src/error-pages && JEKYLL_ENV=production \
+               $(JEKYLL) build --quiet --incremental
 
 .PHONY: upload-error-pages
 upload-error-pages: error-pages
-       scp -P 222 src/error-pages/_site/*.http root@fw01.haj.ipfire.org:/etc/haproxy/errors/
+       rsync --verbose --progress --recursive --delete -e "ssh -p 222" --exclude="feed.xml" \
+               src/error-pages/_site/ root@fw01.haj.ipfire.org:/etc/haproxy/errors/
 
 # ------------------------------------------------------------------------------