--- Makefile.orig	2015-06-25 10:00:03 UTC
+++ Makefile
@@ -1,3 +1,5 @@
+include app.mk
+
 ###-----------------------------------------------------------------------------
 ### APPLICATION LAYOUT
 ###-----------------------------------------------------------------------------
@@ -35,7 +37,10 @@ clobber: clean
 test:
 	./rebar ct
 
-doc: man html pdf
+doc: dirs man
+
+dirs:
+	@$(MKDIR) doc/man
 
 man: $(MANS)
 	@$(MV) doc/man/$(APPNAME)_overview.3 doc/man/$(APPNAME).1
@@ -49,14 +54,14 @@ pdf: $(PDFS)
 %.3: %.ndoc
 	@$(CD) doc; $(SED) "s|%MODULES%|`echo $(MODS)`|g" ../$^ | \
 	$(SED) "s|%VSN%|$(VSN)|g" | $(SED) "s|%APPLICATION%|$(APPNAME)|g" | \
-	$(ERLDOC) -i - -t man --no-toc --erl -o man/$@; $(CD) ..
+	$(ERLDOC) -i - -t man --no-toc -o man/$@; $(CD) ..
 
 %.html: %.ndoc
 	@$(CD) doc; $(SED) "s|%MODULES%|`echo $(MODS)`|g" ../$^ | \
 	$(SED) "s|%VSN%|$(VSN)|g" | $(SED) "s|%APPLICATION%|$(APPNAME)|g" | \
-	$(ERLDOC) -i - -t xhtml --erl -o html/$@; $(CD) ..
+	$(ERLDOC) -i - -t xhtml -o html/$@; $(CD) ..
 
 %.pdf: %.ndoc
 	@$(CD) doc; $(SED) "s|%MODULES%|`echo $(MODS)`|g" ../$^ | \
 	$(SED) "s|%VSN%|$(VSN)|g" | $(SED) "s|%APPLICATION%|$(APPNAME)|g" | \
-	$(ERLDOC) -i - -t pdf --no-toc --erl -o pdf/$@; $(CD) ..
+	$(ERLDOC) -i - -t pdf --no-toc -o pdf/$@; $(CD) ..