install path fixes

* rpm: correct pkgconfig path

pkconfig files get installed to $datarootdir/pkgconfig but rpm expects
them to be at $datadir. This works when $datarootdir==$datadir which is
the case most of the time but will fail when they differ.

* install: make initramfs-tools path static

Since initramfs-tools' path is nothing we can control as it is an
external package it does not make any sense to install zfs additions
anywhere else. Simply use /usr/share/initramfs-tools as path.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Richard Laager <rlaager@wiktel.com>
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
Closes #9087

diff --git a/contrib/initramfs/Makefile.am b/contrib/initramfs/Makefile.am
index 9f912d9466499e97bcf9b928ffce3722b751c119..fefd676ce0f9631298ca4a86b89b02f3406812d8 100644 (file)
--- a/contrib/initramfs/Makefile.am
+++ b/contrib/initramfs/Makefile.am
@@ -1,4 +1,4 @@
-initrddir = $(datarootdir)/initramfs-tools
+initrddir = /usr/share/initramfs-tools
 
 initrd_SCRIPTS = \
        conf.d/zfs conf-hooks.d/zfs hooks/zfs scripts/zfs scripts/local-top/zfs

diff --git a/contrib/initramfs/hooks/Makefile.am b/contrib/initramfs/hooks/Makefile.am
index c866b4fb6cd7ae3dd4633ec7d342d7fc6bbf572d..1735872c29b7ff3c3a6802f88e9d0157ee2413ec 100644 (file)
--- a/contrib/initramfs/hooks/Makefile.am
+++ b/contrib/initramfs/hooks/Makefile.am
@@ -1,4 +1,4 @@
-hooksdir = $(datarootdir)/initramfs-tools/hooks
+hooksdir = /usr/share/initramfs-tools/hooks
 
 hooks_SCRIPTS = \
        zfs

diff --git a/contrib/initramfs/scripts/Makefile.am b/contrib/initramfs/scripts/Makefile.am
index a550311cd744560234c565b1821ca519cb0b9210..12c2641b80cce465af338acecce9112bee638365 100644 (file)
--- a/contrib/initramfs/scripts/Makefile.am
+++ b/contrib/initramfs/scripts/Makefile.am
@@ -1,4 +1,4 @@
-scriptsdir = $(datarootdir)/initramfs-tools/scripts
+scriptsdir = /usr/share/initramfs-tools/scripts
 
 scripts_DATA = \
        zfs

diff --git a/contrib/initramfs/scripts/local-top/Makefile.am b/contrib/initramfs/scripts/local-top/Makefile.am
index 88aa2d4ffa6661f7cbf0354963c3c44a9c1359e8..c820325947b03029444541fdda0363db4737b72d 100644 (file)
--- a/contrib/initramfs/scripts/local-top/Makefile.am
+++ b/contrib/initramfs/scripts/local-top/Makefile.am
@@ -1,3 +1,3 @@
-localtopdir = $(datarootdir)/initramfs-tools/scripts/local-top
+localtopdir = /usr/share/initramfs-tools/scripts/local-top
 
 EXTRA_DIST = zfs

diff --git a/rpm/generic/zfs.spec.in b/rpm/generic/zfs.spec.in
index 4fdf7bb69ec7431c019be8338278c590536e6a57..a74d066bbae1eab2e6487e0662b5d4c206f2fca9 100644 (file)
--- a/rpm/generic/zfs.spec.in
+++ b/rpm/generic/zfs.spec.in
@@ -458,8 +458,8 @@ systemctl --system daemon-reload >/dev/null || true
 %{_libdir}/libzfs*.so.*
 
 %files -n libzfs2-devel
-%{_datadir}/pkgconfig/libzfs.pc
-%{_datadir}/pkgconfig/libzfs_core.pc
+%{_datarootdir}/pkgconfig/libzfs.pc
+%{_datarootdir}/pkgconfig/libzfs_core.pc
 %{_libdir}/*.so
 %{_includedir}/*
 %doc AUTHORS COPYRIGHT LICENSE NOTICE README.md