a5bd9f6
From c7d45a90490c5f3337a6412a6ebe500e3a41a63b Mon Sep 17 00:00:00 2001
a5bd9f6
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
a5bd9f6
Date: Wed, 12 Sep 2012 08:27:26 +0200
a5bd9f6
Subject: [PATCH 036/364] 	Don't require grub-mkconfig_lib to generate
a5bd9f6
 manpages for programs.
a5bd9f6
a5bd9f6
	* gentpl.py (manpage): Additional argument adddeps. Add adddeps to
a5bd9f6
	dependencies, don't add grub-mkconfig_lib.
a5bd9f6
	(program): Pass empty adddeps.
a5bd9f6
	(script): Pass grub-mkconfig_lib as adddeps.
a5bd9f6
---
a5bd9f6
 ChangeLog | 9 +++++++++
a5bd9f6
 gentpl.py | 8 ++++----
a5bd9f6
 2 files changed, 13 insertions(+), 4 deletions(-)
a5bd9f6
a5bd9f6
diff --git a/ChangeLog b/ChangeLog
a5bd9f6
index c697e17..8576923 100644
a5bd9f6
--- a/ChangeLog
a5bd9f6
+++ b/ChangeLog
a5bd9f6
@@ -1,3 +1,12 @@
a5bd9f6
+2012-09-12  Vladimir Serbinenko  <phcoder@gmail.com>
a5bd9f6
+
a5bd9f6
+	Don't require grub-mkconfig_lib to generate manpages for programs.
a5bd9f6
+
a5bd9f6
+	* gentpl.py (manpage): Additional argument adddeps. Add adddeps to
a5bd9f6
+	dependencies, don't add grub-mkconfig_lib.
a5bd9f6
+	(program): Pass empty adddeps.
a5bd9f6
+	(script): Pass grub-mkconfig_lib as adddeps.
a5bd9f6
+
a5bd9f6
 2012-09-11  Vladimir Serbinenko  <phcoder@gmail.com>
a5bd9f6
 
a5bd9f6
 	* grub-core/disk/diskfilter.c (free_array) [GRUB_UTIL]: Fix memory leak.
a5bd9f6
diff --git a/gentpl.py b/gentpl.py
a5bd9f6
index bab4a8a..6d7f613 100644
a5bd9f6
--- a/gentpl.py
a5bd9f6
+++ b/gentpl.py
a5bd9f6
@@ -484,10 +484,10 @@ def library(platform):
a5bd9f6
 def installdir(default="bin"):
a5bd9f6
     return "[+ IF installdir +][+ installdir +][+ ELSE +]" + default + "[+ ENDIF +]"
a5bd9f6
 
a5bd9f6
-def manpage():
a5bd9f6
+def manpage(adddeps):
a5bd9f6
     r  = "if COND_MAN_PAGES\n"
a5bd9f6
     r += gvar_add("man_MANS", "[+ name +].[+ mansection +]\n")
a5bd9f6
-    r += rule("[+ name +].[+ mansection +]", "[+ name +] grub-mkconfig_lib", """
a5bd9f6
+    r += rule("[+ name +].[+ mansection +]", "[+ name +] " + adddeps, """
a5bd9f6
 chmod a+x [+ name +]
a5bd9f6
 PATH=$(builddir):$$PATH pkgdatadir=$(builddir) $(HELP2MAN) --section=[+ mansection +] -i $(top_srcdir)/docs/man/[+ name +].h2m -o $@ [+ name +]
a5bd9f6
 """)
a5bd9f6
@@ -503,7 +503,7 @@ def program(platform, test=False):
a5bd9f6
     r += gvar_add("TESTS", "[+ name +]")
a5bd9f6
     r += "[+ ELSE +]"
a5bd9f6
     r += var_add(installdir() + "_PROGRAMS", "[+ name +]")
a5bd9f6
-    r += "[+ IF mansection +]" + manpage() + "[+ ENDIF +]"
a5bd9f6
+    r += "[+ IF mansection +]" + manpage("") + "[+ ENDIF +]"
a5bd9f6
     r += "[+ ENDIF +]"
a5bd9f6
 
a5bd9f6
     r += var_set(cname() + "_SOURCES", platform_sources(platform))
a5bd9f6
@@ -532,7 +532,7 @@ def script(platform):
a5bd9f6
     r += gvar_add ("TESTS", "[+ name +]")
a5bd9f6
     r += "[+ ELSE +]"
a5bd9f6
     r += var_add(installdir() + "_SCRIPTS", "[+ name +]")
a5bd9f6
-    r += "[+ IF mansection +]" + manpage() + "[+ ENDIF +]"
a5bd9f6
+    r += "[+ IF mansection +]" + manpage("grub-mkconfig_lib") + "[+ ENDIF +]"
a5bd9f6
     r += "[+ ENDIF +]"
a5bd9f6
 
a5bd9f6
     r += rule("[+ name +]", platform_sources(platform) + " $(top_builddir)/config.status", """
a5bd9f6
-- 
a5bd9f6
1.8.1.4
a5bd9f6