[#644,!370] Makefile fixes

diff --git a/doc/Makefile.am b/doc/Makefile.am
index f1222e332066acd26c7508f748217249f51b1de4..64a99fbc164466998307ab7ac4d5ae58f8d2a130 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
-SUBDIRS = devel sphinx
+SUBDIRS = sphinx devel
 
-EXTRA_DIST += images/kea-logo-100x70.png
+EXTRA_DIST = images/kea-logo-100x70.png
 
 nobase_dist_doc_DATA  = examples/agent/comments.json
 nobase_dist_doc_DATA += examples/agent/simple.json

diff --git a/doc/sphinx/Makefile.am b/doc/sphinx/Makefile.am
index a1a3c895e1776d629ae3f82bc03d1b6d9664e433..6fd6f8874e6778c1cc42af6fc4829955ce0fac05 100644 (file)
--- a/doc/sphinx/Makefile.am
+++ b/doc/sphinx/Makefile.am
@@ -108,7 +108,7 @@ mes_files+=$(top_srcdir)/src/bin/netconf/netconf_messages.mes
 endif
 
 
-all: pdf html mans
+all: html mans pdf
 
 kea-messages.rst: $(mes_files) system_messages.py
        $(srcdir)/system_messages.py -o $@ $(mes_files)