blog: Don't use port

[personal/website.git] / Makefile

diff --git a/Makefile b/Makefile
index 433bb14b09904c8ecd1d56593134e5de90fa196d..7f8307ab2a67260e7d214a0932908948bfdd7de2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -35,18 +35,18 @@ sync: download upload
 download:
        # Get new posts
        rsync -Pa --ignore-existing \
 download:
        # Get new posts
        rsync -Pa --ignore-existing \

-               alerce:/srv/llucax/www/blog/posts/ \
+               llucax.com:/srv/llucax/www/blog/posts/ \

                source/blog/posts
        # Get new comments
        rsync -Pa --ignore-existing \
                source/blog/posts
        # Get new comments
        rsync -Pa --ignore-existing \

-               alerce:/srv/llucax/www/blog/comments/ \
+               llucax.com:/srv/llucax/www/blog/comments/ \

                source/blog/comments
        # Get modified dbs
        cp source/blog/posts/db /tmp/blog.db.tmp
        rsync -Pa --update --include '*/db' \
                --exclude posts/current --exclude 'posts/*/*' --exclude 'comments/*/*' \
                source/blog/comments
        # Get modified dbs
        cp source/blog/posts/db /tmp/blog.db.tmp
        rsync -Pa --update --include '*/db' \
                --exclude posts/current --exclude 'posts/*/*' --exclude 'comments/*/*' \

-               alerce:/srv/llucax/www/blog/comments \
-               alerce:/srv/llucax/www/blog/posts \
+               llucax.com:/srv/llucax/www/blog/comments \
+               llucax.com:/srv/llucax/www/blog/posts \

                source/blog/
        diff /tmp/blog.db.tmp source/blog/posts/db | grep '^-' && ( \
                echo "Conflict between posts DBs" && false ) || true
                source/blog/
        diff /tmp/blog.db.tmp source/blog/posts/db | grep '^-' && ( \
                echo "Conflict between posts DBs" && false ) || true


@@ -55,19 +55,17 @@ download:
 
 upload:
        rsync -Pa --delete source/blog/ build/html/blog
 
 upload:
        rsync -Pa --delete source/blog/ build/html/blog

-       rsync -Pa --exclude=\*.swp --exclude=\*.pyc build/html/ alerce:/srv/llucax/www
+       rsync -Pa --exclude=\*.swp --exclude=\*.pyc build/html/ llucax.com:/srv/llucax/www

 
 html:
        $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) build/html
 
 html:
        $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) build/html

-       cd source/proj/mutest/repo && make doc && cp -v manual.html manual.pdf ..
-       rsync -a --delete --exclude repo source/proj/mutest/ build/html/proj/mutest
-       rsync -a --delete source/proj/eventxx/ build/html/proj/eventxx
+       cd source/proj/mutest/repo && make doc && \
+               rsync -a --delete manual.* ../releases ../../../../build/html/proj/mutest/ && \
+               ln -fs manual.html ../../../../build/html/proj/mutest/index.html
+       cd source/proj/eventxx/repo && doxygen && \
+               rsync -a --delete doc/html/ ../releases ../../../../build/html/proj/eventxx/

        rsync -a --delete source/proj/mutt-nntp-debian/files/ build/html/proj/mutt-nntp-debian/files
        rsync -a --delete source/proj/sadba/files/ build/html/proj/sadba/files
        rsync -a --delete source/proj/mutt-nntp-debian/files/ build/html/proj/mutt-nntp-debian/files
        rsync -a --delete source/proj/sadba/files/ build/html/proj/sadba/files

-       rsync -a source/resume/*.pdf build/html/resume/
-       rsync -a source/proj/dgc/*.pdf build/html/proj/dgc/
-       rsync -a source/proj/dgc/*.bz2 build/html/proj/dgc/
-       rsync -a source/proj/dgc/*.png build/html/proj/dgc/

        rsync -a source/robots.txt build/html/
        @echo
        @echo "Build finished. The HTML pages are in build/html."
        rsync -a source/robots.txt build/html/
        @echo
        @echo "Build finished. The HTML pages are in build/html."