chiark / gitweb /
Move pkg-config docs and man pages before conditionals.
authorDiego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com>
Fri, 7 Aug 2009 01:07:51 +0000 (03:07 +0200)
committerKay Sievers <kay.sievers@vrfy.org>
Fri, 7 Aug 2009 17:15:30 +0000 (19:15 +0200)
Since gudev conditionally installs further pkg-config data, we have to set
it before the condition might be expanded.

Makefile.am

index 67a0fb08a707cde945179ff447a80c3d1a2ec526..cc5c49ad6f79a9e32dfe47ba4c789c5dfd855d4f 100644 (file)
@@ -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
 # ------------------------------------------------------------------------------