From ac6f437317c4ebe86e2a52666cd809718ccbd19c Mon Sep 17 00:00:00 2001 From: Oron Peled Date: Mon, 18 May 2015 15:42:38 +0000 Subject: [PATCH] automake: xpp: handle udev rules * Set udev installation directory to $sysconfdir/udev/rules.d * Add definitions to xpp/Makefile.am and remove them from xpp/Makefile.legacy * TODO: add "--with-udev-rulesdir=" for packagers (/lib/udev/rules.d) Signed-off-by: Tzafrir Cohen --- configure.ac | 2 ++ xpp/Makefile.am | 3 +++ xpp/Makefile.legacy | 3 --- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 1557888..796410b 100644 --- a/configure.ac +++ b/configure.ac @@ -37,6 +37,8 @@ if test ${localstatedir} = '${prefix}/var'; then localstatedir=/var fi +AC_SUBST([udevrulesdir], '${sysconfdir}/udev/rules.d') + # specify output header file AC_CONFIG_HEADER(autoconfig.h) diff --git a/xpp/Makefile.am b/xpp/Makefile.am index 7d060d5..3dacac2 100644 --- a/xpp/Makefile.am +++ b/xpp/Makefile.am @@ -55,6 +55,9 @@ perl_mans = $(perl_scripts:%=%.8) endif +udevrulesdir = @udevrulesdir@ +udevrules_DATA = xpp.rules + dist_sbin_SCRIPTS = $(perl_scripts) man_MANS = $(perl_mans) CLEANFILES = $(perl_checks) $(perl_mans) diff --git a/xpp/Makefile.legacy b/xpp/Makefile.legacy index 3d49b09..3dc3f89 100644 --- a/xpp/Makefile.legacy +++ b/xpp/Makefile.legacy @@ -20,7 +20,6 @@ INSTALL_DATA = $(INSTALL) -m 644 prefix ?= /usr datadir ?= $(prefix)/share sysconfdir ?= $(prefix)/etc -udevrulesdir ?= $(sysconfdir)/udev/rules.d INSTALL ?= install INSTALL_DATA = $(INSTALL) -m 644 @@ -37,7 +36,5 @@ install: all $(INSTALL) -d $(DESTDIR)$(DATADIR) $(INSTALL) xpp_fxloader astribank_hook $(DESTDIR)$(DATADIR)/ $(INSTALL) waitfor_xpds $(DESTDIR)$(DATADIR)/ - $(INSTALL) -d $(DESTDIR)$(udevrulesdir) - $(INSTALL_DATA) xpp.rules $(DESTDIR)$(udevrulesdir)/ clean: