From 61ee632d2333f458cd4f789826d15ad9c497cc4f Mon Sep 17 00:00:00 2001
From: Jan-Piet Mens <jpmens@gmail.com>
Date: Sun, 30 Sep 2012 13:33:21 +0200
Subject: [PATCH] documentation: man template: support empty options; add
 Version to Makefile

---
 Makefile                 | 2 +-
 hacking/templates/man.j2 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 596dcc5d1aa..e43718646d9 100644
--- a/Makefile
+++ b/Makefile
@@ -161,4 +161,4 @@ deb: debian
 # for arch or gentoo, read instructions in the appropriate 'packaging' subdirectory directory
 
 manpages:
-	hacking/module_formatter.py -t man -o docs/man/man1/ --module-dir=library --template-dir=hacking/templates
+	hacking/module_formatter.py -A $(VERSION) -t man -o docs/man/man1/ --module-dir=library --template-dir=hacking/templates
diff --git a/hacking/templates/man.j2 b/hacking/templates/man.j2
index 47a960285c4..7ec644f26ec 100644
--- a/hacking/templates/man.j2
+++ b/hacking/templates/man.j2
@@ -11,7 +11,7 @@
 ." ------ OPTIONS
 ."
 ."
-{% if options is defined -%}
+{% if options -%}
 .SH OPTIONS
 {% for (k,v) in options.iteritems()  %}
 .IP @{ k }@