[gentoo-commits] proj/eudev:master commit in: rules/, /

[gentoo-commits] proj/eudev:master commit in: rules/, /

[Anthony G. Basile]

commit:     941d20bce37b304215817e93e3d98d3018fc847b
Author:     Marius Bakke <marius <AT> devup <DOT> no>
AuthorDate: Thu Apr  9 10:47:44 2020 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Apr 10 13:26:02 2020 +0000
URL:        https://gitweb.gentoo.org/proj/eudev.git/commit/?id=941d20bc

rules/64-btrfs.rules: Expand @bindir@ to the absolute directory name.

This fixes #182 by ensuring @bindir@ is fully expanded at installation
time.  See "Installation Directory Variables" in the GNU Autoconf
manual, in particular the note about AC_CONFIG_FILES.

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 configure.ac      | 1 -
 rules/Makefile.am | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 9ba4f124e..fda10eac5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -305,7 +305,6 @@ AC_CONFIG_FILES([Makefile
                  rule_generator/Makefile
                  rule_generator/write_net_rules
                  rules/Makefile
-                 rules/64-btrfs.rules
                  src/Makefile
                  src/ata_id/Makefile
                  src/cdrom_id/Makefile

diff --git a/rules/Makefile.am b/rules/Makefile.am
index 4c8758426..6143851a9 100644
--- a/rules/Makefile.am
+++ b/rules/Makefile.am
@@ -43,5 +43,11 @@ dist_udevrules_DATA += \
 	75-probe_mtd.rules
 endif
 
+do_subst = $(SED) \
+	-e 's,[@]bindir[@],$(bindir),g'
+
+64-btrfs.rules: 64-btrfs.rules.in Makefile
+	$(do_subst) < $< > $@
+
 install-data-local:
 	$(MKDIR_P) $(DESTDIR)$(udevconfdir)/rules.d