diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2009-08-14 14:17:50 +0200 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2009-08-14 14:17:50 +0200 |
| commit | 2016ac8ede502dfbcddaf4f4ce504d249183b47f (patch) | |
| tree | 72878e54842ef1b7d96dbf773ecab927e15dc3b2 | |
| parent | cb6268f41935a217f3694bf54f482d8770d8c3bc (diff) | |
make: fix issues from non-recursive conversion
| -rw-r--r-- | Makefile.am | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 221e91f538..bc18fd130f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,6 +39,9 @@ DISTCHECK_CONFIGURE_FLAGS = \ --enable-gtk-doc \ --enable-extras +install-data-local: + -mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d + clean-local: rm -rf udev-test-install @@ -115,6 +118,9 @@ libudev_libudev_private_la_SOURCES =\ libudev_libudev_private_la_LIBADD = +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libudev/libudev.pc + extras_gudev_libgudev_1_0_la_SOURCES = \ extras/gudev/gudevenums.h \ extras/gudev/gudevenumtypes.h \ @@ -325,10 +331,8 @@ EXTRA_DIST += \ # ------------------------------------------------------------------------------ # Pkg-config, docs and man pages # ------------------------------------------------------------------------------ -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = \ - libudev/libudev.pc \ - udev/udev.pc +sharepkgconfigdir = $(datadir)/pkgconfig +sharepkgconfig_DATA = udev/udev.pc writing_udev_rulesdir = $(docdir)/writing_udev_rules dist_writing_udev_rules_DATA = \ @@ -370,7 +374,8 @@ dist_udevrules_DATA += \ extras/hid2hci/70-hid2hci.rules \ extras/modem-modeswitch/61-option-modem-modeswitch.rules \ extras/modem-modeswitch/61-mobile-action.rules \ - extras/keymap/95-keymap.rules + extras/keymap/95-keymap.rules \ + extras/udev-acl/70-acl.rules libexec_PROGRAMS += \ extras/hid2hci/hid2hci \ @@ -447,8 +452,7 @@ libgudev_include_HEADERS = \ pkgconfig_DATA += extras/gudev/gudev-1.0.pc -SUBDIRS += \ - extras/gudev/docs +SUBDIRS += extras/gudev/docs endif if ENABLE_INTROSPECTION |