aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niewöhner <[email protected]>2019-07-30 19:06:09 +0200
committerMatthew Ahrens <[email protected]>2019-07-30 10:06:09 -0700
commita6c82894735a476ce5eb275f307ec0b5430296e4 (patch)
tree27c27092f248c7dab89118ad0fc4af8d2d55f6be
parent85ce79bbc8cf17f100eb4ae6a0d1b1ce2e2dd9d9 (diff)
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 <[email protected]> Reviewed-by: Richard Laager <[email protected]> Signed-off-by: Michael Niewöhner <[email protected]> Closes #9087
-rw-r--r--contrib/initramfs/Makefile.am2
-rw-r--r--contrib/initramfs/hooks/Makefile.am2
-rw-r--r--contrib/initramfs/scripts/Makefile.am2
-rw-r--r--contrib/initramfs/scripts/local-top/Makefile.am2
-rw-r--r--rpm/generic/zfs.spec.in4
5 files changed, 6 insertions, 6 deletions
diff --git a/contrib/initramfs/Makefile.am b/contrib/initramfs/Makefile.am
index 9f912d946..fefd676ce 100644
--- 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 c866b4fb6..1735872c2 100644
--- 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 a550311cd..12c2641b8 100644
--- 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 88aa2d4ff..c82032594 100644
--- 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 4fdf7bb69..a74d066bb 100644
--- 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