summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorDiego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com>2009-08-07 03:07:51 +0200
committerKay Sievers <kay.sievers@vrfy.org>2009-08-07 19:15:30 +0200
commit5b528d84796e64f42f97613b8479f22e500292f7 (patch)
treed223b4f08e3c4ce1e0d3e2068eecec76c9da9074 /Makefile.am
parentc831e09b87752b47f32ec0a174075db974190693 (diff)
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.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am52
1 files changed, 26 insertions, 26 deletions
diff --git a/Makefile.am b/Makefile.am
index 67a0fb08a7..cc5c49ad6f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -267,6 +267,32 @@ EXTRA_DIST += \
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…)
# ------------------------------------------------------------------------------
if WITH_SELINUX
@@ -363,32 +389,6 @@ SUBDIRS += \
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
# ------------------------------------------------------------------------------
install-exec-hook: $(INSTALL_EXEC_HOOKS)