summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2015-02-09 01:15:07 +0100
committerMichael Biebl <biebl@debian.org>2015-02-09 01:42:05 +0100
commit3984b1cae0b5d029fd96c753644d1113ffe5b8e2 (patch)
tree3280724de354b2c5f6e69c4fafa35732850690f3
parent7dd6a1d428a96c57657cabebb8bdfa87e48f4309 (diff)
Don't install nm-settings-ifcfg-rh.5 man page
We don't enable the ifcfg-rh plugin in the Debian package.
-rw-r--r--debian/patches/0010-build-install-nm-settings-ifcfg-rh.5-man-page-condit.patch32
-rw-r--r--debian/patches/series1
2 files changed, 33 insertions, 0 deletions
diff --git a/debian/patches/0010-build-install-nm-settings-ifcfg-rh.5-man-page-condit.patch b/debian/patches/0010-build-install-nm-settings-ifcfg-rh.5-man-page-condit.patch
new file mode 100644
index 000000000..faf28e14d
--- /dev/null
+++ b/debian/patches/0010-build-install-nm-settings-ifcfg-rh.5-man-page-condit.patch
@@ -0,0 +1,32 @@
+From: Michael Biebl <biebl@debian.org>
+Date: Mon, 9 Feb 2015 01:12:16 +0100
+Subject: build: install nm-settings-ifcfg-rh.5 man page conditionally
+
+Only install nm-settings-ifcfg-rh.5 man page if the ifcfg-rh
+configuration plugin has been enabled.
+---
+ man/Makefile.am | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/man/Makefile.am b/man/Makefile.am
+index 4577cb4..5ed5ad5 100644
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -67,9 +67,15 @@ docbook_generated_man_pages = \
+ nmcli-examples.5
+
+ docbook_autogenerated_man_pages = \
+- nm-settings.5 \
+- nm-settings-keyfile.5 \
++ nm-settings.5
++
++docbook_autogenerated_man_pages = \
++ nm-settings-keyfile.5
++
++if CONFIG_PLUGIN_IFCFG_RH
++docbook_autogenerated_man_pages += \
+ nm-settings-ifcfg-rh.5
++endif
+
+ EXTRA_DIST += \
+ nm-settings.xml \
diff --git a/debian/patches/series b/debian/patches/series
index 43e9f5c08..5fd82c7d5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
0007-fix-arping-path.patch
0008-Fix-dependencies-in-libnm.pc.patch
0009-Check-at-runtime-whether-to-start-ModemManager.patch
+0010-build-install-nm-settings-ifcfg-rh.5-man-page-condit.patch