From: Diego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com>
Date: Fri, 7 Aug 2009 01:07:51 +0000 (+0200)
Subject: Move pkg-config docs and man pages before conditionals.
X-Git-Tag: 174~849
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b528d84796e64f42f97613b8479f22e500292f7;p=systemd

Move pkg-config docs and man pages before conditionals.

Since gudev conditionally installs further pkg-config data, we have to set
it before the condition might be expanded.
---

diff --git a/Makefile.am b/Makefile.am
index 67a0fb08..cc5c49ad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -266,6 +266,32 @@ EXTRA_DIST += \
 	rules/suse \
 	rules/gentoo
 
+# ------------------------------------------------------------------------------
+# Pkg-config, docs and man pages
+# ------------------------------------------------------------------------------
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = \
+	libudev/libudev.pc \
+	udev/udev.pc
+
+writing_udev_rulesdir = $(docdir)/writing_udev_rules
+dist_writing_udev_rules_DATA = \
+	docs/writing_udev_rules/index.html
+
+dist_man_MANS = \
+	udev/udev.7 \
+	udev/udevadm.8 \
+	udev/udevd.8 \
+	extras/scsi_id/scsi_id.8
+
+EXTRA_DIST += \
+	udev/udev.xml \
+	udev/udevadm.xml \
+	udev/udevd.xml
+
+%.7 %.8 : %.xml
+	$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+
 # ------------------------------------------------------------------------------
 # Conditionals (SElinux, etc…)
 # ------------------------------------------------------------------------------
@@ -362,32 +388,6 @@ SUBDIRS += \
 	extras/gudev
 endif
 
-# ------------------------------------------------------------------------------
-# Pkg-config, docs and man pages
-# ------------------------------------------------------------------------------
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = \
-	libudev/libudev.pc \
-	udev/udev.pc
-
-writing_udev_rulesdir = $(docdir)/writing_udev_rules
-dist_writing_udev_rules_DATA = \
-	docs/writing_udev_rules/index.html
-
-dist_man_MANS = \
-	udev/udev.7 \
-	udev/udevadm.8 \
-	udev/udevd.8 \
-	extras/scsi_id/scsi_id.8
-
-EXTRA_DIST += \
-	udev/udev.xml \
-	udev/udevadm.xml \
-	udev/udevd.xml
-
-%.7 %.8 : %.xml
-	$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-
 # ------------------------------------------------------------------------------
 # Install and uninstall hooks
 # ------------------------------------------------------------------------------