Merge branch 'v2.2'

Makefile

@@ -9,7 +9,7 @@ SUBDIRS := $(SRCDIRS) user-doc developer-doc regtest
 SUBDIRSCLEAN:=$(addsuffix .clean,$(SUBDIRS))
 
      
-.PHONY: all lib clean $(SRCDIRS) doc docclean check cppcheck distclean
+.PHONY: all lib clean $(SRCDIRS) doc docclean check cppcheck distclean all_plus_docs
 
 # if machine dependent configuration has been found:
 ifdef GCCDEP
@@ -17,6 +17,12 @@ all:
 	$(MAKE) lib
 	$(MAKE) -C vim
 
+# target useful for macports
+# it builds the code then the documentation
+all_plus_docs:
+	$(MAKE) all
+	$(MAKE) docs
+
 lib:
 	$(MAKE)	-C src