diff options
| author | Bastien Nocera <hadess@hadess.net> | 2010-08-23 13:33:55 +0100 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@mandriva.com> | 2010-08-23 16:02:05 +0200 |
| commit | cb7492942604aa2387b8414c47f673812140fb2d (patch) | |
| tree | a46c940efafe0128865f7a8b38a6161d7a48a3ba | |
| parent | 97cdd1c132dc77df65631f630041da1c7d381d0c (diff) | |
Add parser tools to the distribution
And make the "distcheck" rule actually work.
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | media-players/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/Makefile.am | 1 |
4 files changed, 15 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index fe7cad7..83ad1f3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1 +1,2 @@ -SUBDIRS=media-players +SUBDIRS=media-players tools +DISTCHECK_CONFIGURE_FLAGS = --with-udevdir='$${libdir}/udev-distcheck' diff --git a/configure.ac b/configure.ac index f4b84ff..f6096d2 100644 --- a/configure.ac +++ b/configure.ac @@ -3,10 +3,20 @@ AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([media-players/]) PKG_CHECK_MODULES(UDEV, udev) -AC_SUBST([udev_dir], [$($PKG_CONFIG --variable=udevdir udev)]) +AC_ARG_WITH(udevdir, + AS_HELP_STRING([--with-udevdir=DIR],[Installation path for udev rules @<:@auto@:>@]), + [ac_with_udevdir=$withval], + [ac_with_udevdir=""]) +if test "${ac_with_udevdir}" = ""; then + ac_with_udevdir=`$PKG_CONFIG --variable=udevdir udev` +fi + +AC_MSG_NOTICE([installing udev rules in ${ac_with_udevdir}/rules.d]) +AC_SUBST([UDEV_DIR],[${ac_with_udevdir}]) AC_OUTPUT([ Makefile +tools/Makefile media-players/Makefile ]) diff --git a/media-players/Makefile.am b/media-players/Makefile.am index f533120..96a3cd0 100644 --- a/media-players/Makefile.am +++ b/media-players/Makefile.am @@ -1,7 +1,7 @@ mpidir = $(datadir)/media-player-info dist_mpi_DATA = $(shell find $(top_srcdir)/media-players -name "*.mpi" -printf "%P\n") -udevrulesdir = $(udev_dir)/rules.d +udevrulesdir = $(UDEV_DIR)/rules.d dist_udevrules_DATA = 40-usb-media-players.rules 40-usb-media-players.rules: $(dist_mpi_DATA) $(top_srcdir)/tools/mpi2udev.py $(top_srcdir)/tools/mpi2udev.py $(dist_mpi_DATA) > 40-usb-media-players.rules diff --git a/tools/Makefile.am b/tools/Makefile.am new file mode 100644 index 0000000..acb10f5 --- /dev/null +++ b/tools/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = COPYING fdi2mpi.py mpi2udev.py |