From 5a4c54c793f83ba0878878272397c56a6fba4e6b Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Mon, 4 Apr 2016 18:39:44 +0200
Subject: man: rename some variables

No functional change, just a readability improvement. No need to prefix
the variables with docbook_ and docbook_generated -- all manual pages
are generated from docbook.
---
 man/Makefile.am | 56 +++++++++++++++++++++++++++-----------------------------
 1 file changed, 27 insertions(+), 29 deletions(-)

diff --git a/man/Makefile.am b/man/Makefile.am
index dce981060d..c84e3b9e3e 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -68,36 +68,34 @@ CLEANFILES +=				\
 
 endif
 
-docbook_generated_man_pages =		\
-	nmcli.1				\
-	nmtui.1				\
-	nm-online.1			\
-	NetworkManager.8		\
-	NetworkManager.conf.5		\
-	nmcli-examples.5
-
-docbook_autogenerated_man_pages =	\
-	nm-settings.5			\
+man_pages =			\
+	nmcli.1			\
+	nmtui.1			\
+	nm-online.1		\
+	NetworkManager.conf.5	\
+	nmcli-examples.5	\
+	NetworkManager.8
+
+autogenerated_man_pages =	\
+	nm-settings.5		\
 	nm-settings-keyfile.5
 
 if CONFIG_PLUGIN_IFCFG_RH
-docbook_autogenerated_man_pages += nm-settings-ifcfg-rh.5
+autogenerated_man_pages += nm-settings-ifcfg-rh.5
 else
 EXTRA_DIST += nm-settings-ifcfg-rh.5
 endif
 
-EXTRA_DIST +=								\
-	nm-settings.xml							\
-	nm-settings.xsl							\
-	nm-settings-keyfile.xml						\
-	nm-settings-keyfile.xsl						\
-	nm-settings-ifcfg-rh.xml					\
-	nm-settings-ifcfg-rh.xsl					\
-	$(addsuffix .xml,$(basename $(docbook_generated_man_pages)))	\
-	$(docbook_generated_man_pages) \
-	$(docbook_autogenerated_man_pages)
-
-man_MANS += $(configure_generated_man_pages)
+EXTRA_DIST +=						\
+	nm-settings.xml					\
+	nm-settings.xsl					\
+	nm-settings-keyfile.xml				\
+	nm-settings-keyfile.xsl				\
+	nm-settings-ifcfg-rh.xml			\
+	nm-settings-ifcfg-rh.xsl			\
+	$(addsuffix .xml,$(basename $(man_pages)))	\
+	$(man_pages)					\
+	$(autogenerated_man_pages)
 
 nmtui_links = nmtui-edit nmtui-connect nmtui-hostname
 NetworkManager_conf_links = nm-system-settings.conf
@@ -119,16 +117,16 @@ uninstall-hook:
 	done
 
 if ENABLE_GTK_DOC
-man_MANS += $(docbook_generated_man_pages)
-CLEANFILES += $(docbook_generated_man_pages)
+man_MANS += $(man_pages)
+CLEANFILES += $(man_pages)
 if SETTING_DOCS_AVAILABLE
-man_MANS += $(docbook_autogenerated_man_pages)
-CLEANFILES += $(docbook_autogenerated_man_pages)
+man_MANS += $(autogenerated_man_pages)
+CLEANFILES += $(autogenerated_man_pages)
 endif
 else
 if INSTALL_PREGEN_MANPAGES
 man_MANS +=					\
-	$(docbook_generated_man_pages)		\
-	$(docbook_autogenerated_man_pages)
+	$(man_pages)		\
+	$(autogenerated_man_pages)
 endif
 endif
-- 
cgit v1.2.1