[systemd-commits] Makefile-man.am man/systemd-firstboot.xml

[Michael Biebl]

 Makefile-man.am           |   17 +++++++++++------
 man/systemd-firstboot.xml |    2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit efd51554aea0f226a7f6704a72aa6a3c9fc6cb2f
Author: Michael Biebl <biebl at debian.org>
Date:   Wed Feb 4 21:31:26 2015 +0100

    build-sys: mark systemd-firstboot man page as conditional
    
    Rebuild Makefile-man.am accordingly.

diff --git a/Makefile-man.am b/Makefile-man.am
index 105853e..7503abb 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -65,7 +65,6 @@ MANPAGES += \
 	man/systemd-detect-virt.1 \
 	man/systemd-efi-boot-generator.8 \
 	man/systemd-escape.1 \
-	man/systemd-firstboot.1 \
 	man/systemd-fsck at .service.8 \
 	man/systemd-fstab-generator.8 \
 	man/systemd-getty-generator.8 \
@@ -207,7 +206,6 @@ MANPAGES_ALIAS += \
 	man/systemd-ask-password-console.path.8 \
 	man/systemd-ask-password-wall.path.8 \
 	man/systemd-ask-password-wall.service.8 \
-	man/systemd-firstboot.service.1 \
 	man/systemd-fsck-root.service.8 \
 	man/systemd-fsck.8 \
 	man/systemd-hibernate-resume.8 \
@@ -320,7 +318,6 @@ man/system.conf.d.5: man/systemd-system.conf.5
 man/systemd-ask-password-console.path.8: man/systemd-ask-password-console.service.8
 man/systemd-ask-password-wall.path.8: man/systemd-ask-password-console.service.8
 man/systemd-ask-password-wall.service.8: man/systemd-ask-password-console.service.8
-man/systemd-firstboot.service.1: man/systemd-firstboot.1
 man/systemd-fsck-root.service.8: man/systemd-fsck at .service.8
 man/systemd-fsck.8: man/systemd-fsck at .service.8
 man/systemd-hibernate-resume.8: man/systemd-hibernate-resume at .service.8
@@ -597,9 +594,6 @@ man/systemd-ask-password-wall.path.html: man/systemd-ask-password-console.servic
 man/systemd-ask-password-wall.service.html: man/systemd-ask-password-console.service.html
 	$(html-alias)
 
-man/systemd-firstboot.service.html: man/systemd-firstboot.html
-	$(html-alias)
-
 man/systemd-fsck-root.service.html: man/systemd-fsck at .service.html
 	$(html-alias)
 
@@ -748,6 +742,17 @@ MANPAGES_ALIAS += \
 
 endif
 
+if ENABLE_FIRSTBOOT
+MANPAGES += \
+	man/systemd-firstboot.1
+MANPAGES_ALIAS += \
+	man/systemd-firstboot.service.1
+man/systemd-firstboot.service.1: man/systemd-firstboot.1
+man/systemd-firstboot.service.html: man/systemd-firstboot.html
+	$(html-alias)
+
+endif
+
 if ENABLE_HOSTNAMED
 MANPAGES += \
 	man/hostnamectl.1 \
diff --git a/man/systemd-firstboot.xml b/man/systemd-firstboot.xml
index 5f19aaf..67d38ba 100644
--- a/man/systemd-firstboot.xml
+++ b/man/systemd-firstboot.xml
@@ -21,7 +21,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="systemd-firstboot"
+<refentry id="systemd-firstboot" conditional='ENABLE_FIRSTBOOT'
     xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <refentryinfo>